diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 6b79422c0a81..b269a78b308c 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -399,6 +399,7 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveWalletSolanaConnectedSitesPreference.java",
"../../brave/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderManager.java",
"../../brave/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderUtils.java",
+ "../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesLayoutBase.java",
"../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java",
"../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java",
"../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java",
diff --git a/android/features/tab_ui/BUILD.gn b/android/features/tab_ui/BUILD.gn
index 743a47822d19..80100989eb7d 100644
--- a/android/features/tab_ui/BUILD.gn
+++ b/android/features/tab_ui/BUILD.gn
@@ -14,7 +14,6 @@ android_library("java") {
deps = [
"//base:base_java",
"//chrome/android:chrome_java",
- "//chrome/android/features/tab_ui:tab_suggestions_java",
"//chrome/browser/android/lifecycle:java",
"//chrome/browser/browser_controls/android:java",
"//chrome/browser/commerce/merchant_viewer/android:java",
diff --git a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
index 07e49ee2b272..5fa6d1a2de37 100644
--- a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
+++ b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -385,11 +385,6 @@
To group tabs, touch & hold a tab. Then, drag it onto another tab.
-
-
- Continue browsing
-
-
Your last tab
@@ -406,37 +401,6 @@
%1$s2 tabs seem related. Group them?
-
-
- Want to close old tabs?
-
-
- {TABS_COUNT, plural,
- =1 {You have %1$s1 tab you haven't used recently}
- other {You have %1$s8 tabs you haven't used recently}
- }
-
-
- Review tabs
-
-
- Close without reviewing
-
-
-
-
- {TABS_COUNT, plural,
- =1 {You have %1$s1 archived tab}
- other {You have %1$s8 archived tabs}
- }
-
-
- Review the current declutter settings.
-
-
- Review all archived tabs for declutter by entering this editor.
-
-
Review the suggestions.
@@ -587,14 +551,6 @@
Close all tabs?
-
- You can find your closed tabs in Recent tabs under the Brave main menu.
-
-
- {INCOGNITO_TABS_COUNT, plural,
- =1 {You can find your closed tabs in Recent tabs under the Brave main menu. Your Private tab won't be available.}
- other {You can find your closed tabs in Recent tabs under the Brave main menu. Your # Private tabs won't be available.}}
-
Close all Private tabs?
@@ -766,6 +722,11 @@
Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section.
+
+ {INCOGNITO_TABS_COUNT, plural,
+ =1 {Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section. Your Private tab won't be available.}
+ other {Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section. Your # Private tabs won't be available.}}
+
Close all tabs and groups
@@ -775,9 +736,6 @@
This will delete the group from all devices signed into %1$stest@gmail.com
-
- Close tab and delete group?
-
Close
@@ -787,9 +745,6 @@
Open the tab group action menu for tab group %1$sShopping cart
-
- This will delete the group from all devices signed into %1$stest@gmail.com
-
Remove tab and delete group
@@ -808,6 +763,9 @@
Tab groups automatically save and update across all your devices
+
+ Create groups to organize your tabs.
+
Your tab groups are saved here and get updated across all your signed-in devices
@@ -817,9 +775,18 @@
New group from your other device
+
+ You can find all your tab groups here
+
Open
+
+ Open %sshopping
+
+
+ %sshopping tab group options
+
@@ -828,6 +795,17 @@
Automatically open tab groups from other devices
+
+
+
+ {TABS_COUNT, plural,
+ =1 {%1$d1 inactive tab}
+ other {%1$d8 inactive tabs}
+ }
+
+
+ Close all inactive tabs
+
diff --git a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings_override.grd b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings_override.grd
index 3dc3bfbf1ee2..b00c6fea7c77 100644
--- a/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings_override.grd
+++ b/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings_override.grd
@@ -86,11 +86,6 @@
-
- {INCOGNITO_TABS_COUNT, plural,
- =1 {You can find your closed tabs in Recent tabs under the Brave main menu. Your Private tab won't be available.}
- other {You can find your closed tabs in Recent tabs under the Brave main menu. Your # Private tabs won't be available.}}
-
Close all Private tabs?
@@ -98,6 +93,11 @@
Your activity in these Private tabs will be removed from this device
+
+ {INCOGNITO_TABS_COUNT, plural,
+ =1 {Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section. Your Private tab won't be available.}
+ other {Your closed tabs and groups can be reopened from the Recent tabs section and the Tab groups section. Your # Private tabs won't be available.}}
+
diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
index a860a5219554..2688f80e6539 100644
--- a/android/java/apk_for_test.flags
+++ b/android/java/apk_for_test.flags
@@ -40,8 +40,8 @@
-keep class org.chromium.chrome.browser.ntp.NewTabPageLayout {
*** mMvTilesContainerLayout;
*** mLogoCoordinator;
+ *** mInitialTileNum;
*** insertSiteSectionView(...);
- *** isScrollableMvtEnabled(...);
*** setSearchProviderTopMargin(...);
*** setSearchProviderBottomMargin(...);
*** getLogoMargin(...);
@@ -122,7 +122,7 @@
public (...);
*** mBottomControlsCoordinatorSupplier;
*** mCallbackController;
- *** mBrowserControlsSizer;
+ *** mBottomControlsStacker;
*** mFullscreenManager;
*** mActivityTabProvider;
*** mAppThemeColorProvider;
@@ -293,7 +293,7 @@
(...);
*** mBottomControlsHeight;
*** mModel;
- *** mBrowserControlsSizer;
+ *** mBottomControlsStacker;
}
-keep class org.chromium.chrome.browser.toolbar.bottom.BraveBottomControlsMediator {
@@ -881,3 +881,7 @@
-keep class org.chromium.chrome.browser.password_manager.settings.BraveExportFlow {
public (...);
}
+
+-keep class org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesLayout
+
+-keep class org.chromium.chrome.browser.suggestions.tile.BraveMostVisitedTilesLayoutBase
diff --git a/android/java/org/chromium/chrome/browser/app/helpers/ImageLoader.java b/android/java/org/chromium/chrome/browser/app/helpers/ImageLoader.java
index 122d610f6996..1a2b5794969f 100644
--- a/android/java/org/chromium/chrome/browser/app/helpers/ImageLoader.java
+++ b/android/java/org/chromium/chrome/browser/app/helpers/ImageLoader.java
@@ -5,6 +5,7 @@
package org.chromium.chrome.browser.app.helpers;
+import static org.chromium.chrome.browser.content.WebContentsFactory.DEFAULT_NETWORK_HANDLE;
import static org.chromium.ui.base.ViewUtils.dpToPx;
import android.content.Context;
@@ -114,8 +115,10 @@ private static void downloadImage(String url, final RequestManager requestManage
WebContentsFactory webContentsFactory = new WebContentsFactory();
WebContents webContents =
- webContentsFactory.createWebContentsWithWarmRenderer(profile, true);
- webContents.downloadImage(new GURL(validUrl), // Url
+ webContentsFactory.createWebContentsWithWarmRenderer(
+ profile, true, DEFAULT_NETWORK_HANDLE);
+ webContents.downloadImage(
+ new GURL(validUrl), // Url
false, // isFavIcon
WalletConstants.MAX_BITMAP_SIZE_FOR_DOWNLOAD, // maxBitmapSize
false, // bypassCache
@@ -141,28 +144,49 @@ private static void downloadImage(String url, final RequestManager requestManage
new BitmapDrawable(resources, bestBitmap);
imageFetcherFacade = new ImageFetcherFacade(bitmapDrawable);
}
- loadImage(imageFetcherFacade, requestManager, isCircular, roundedCorners,
- imageView, customTarget, callback);
+ loadImage(
+ imageFetcherFacade,
+ requestManager,
+ isCircular,
+ roundedCorners,
+ imageView,
+ customTarget,
+ callback);
});
} else {
- ImageFetcher imageFetcher = ImageFetcherFactory.createImageFetcher(
- ImageFetcherConfig.NETWORK_ONLY, profile.getProfileKey());
+ ImageFetcher imageFetcher =
+ ImageFetcherFactory.createImageFetcher(
+ ImageFetcherConfig.NETWORK_ONLY, profile.getProfileKey());
if (isGif(url)) {
imageFetcher.fetchGif(
- Params.create(new GURL(url), UNUSED_CLIENT_NAME), gifImage -> {
+ Params.create(new GURL(url), UNUSED_CLIENT_NAME),
+ gifImage -> {
ImageFetcherFacade imageFetcherFacade =
new ImageFetcherFacade(gifImage.getData());
- loadImage(imageFetcherFacade, requestManager, isCircular,
- roundedCorners, imageView, customTarget, callback);
+ loadImage(
+ imageFetcherFacade,
+ requestManager,
+ isCircular,
+ roundedCorners,
+ imageView,
+ customTarget,
+ callback);
});
} else {
imageFetcher.fetchImage(
- Params.create(new GURL(url), UNUSED_CLIENT_NAME), bitmap -> {
+ Params.create(new GURL(url), UNUSED_CLIENT_NAME),
+ bitmap -> {
BitmapDrawable bitmapDrawable = new BitmapDrawable(resources, bitmap);
ImageFetcherFacade imageFetcherFacade =
new ImageFetcherFacade(bitmapDrawable);
- loadImage(imageFetcherFacade, requestManager, isCircular,
- roundedCorners, imageView, customTarget, callback);
+ loadImage(
+ imageFetcherFacade,
+ requestManager,
+ isCircular,
+ roundedCorners,
+ imageView,
+ customTarget,
+ callback);
});
}
}
diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java
index 6dc81d8dfafe..666cd12e3718 100644
--- a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java
@@ -15,6 +15,8 @@
import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
import org.chromium.ui.modaldialog.ModalDialogManager;
+import java.util.function.BooleanSupplier;
+
class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
// Overridden Chromium's BookmarkToolbarCoordinator.mToolbar
private BookmarkToolbar mToolbar;
@@ -22,7 +24,7 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
BraveBookmarkToolbarCoordinator(
Context context,
SelectableListLayout selectableListLayout,
- SelectionDelegate selectionDelegate,
+ SelectionDelegate selectionDelegate,
SearchDelegate searchDelegate,
DragReorderableRecyclerViewAdapter dragReorderableRecyclerViewAdapter,
boolean isDialogUi,
@@ -32,7 +34,8 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
BookmarkUiPrefs bookmarkUiPrefs,
ModalDialogManager modalDialogManager,
Runnable endSearchRunnable,
- BookmarkMoveSnackbarManager bookmarkMoveSnackbarManager) {
+ BookmarkMoveSnackbarManager bookmarkMoveSnackbarManager,
+ BooleanSupplier incognitoEnabledSupplier) {
super(
context,
selectableListLayout,
@@ -46,7 +49,8 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
bookmarkUiPrefs,
modalDialogManager,
endSearchRunnable,
- bookmarkMoveSnackbarManager);
+ bookmarkMoveSnackbarManager,
+ incognitoEnabledSupplier);
if (mToolbar instanceof BraveBookmarkToolbar) {
((BraveBookmarkToolbar) mToolbar).setBraveBookmarkDelegate(bookmarkDelegateSupplier);
diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/NetworkSelectorActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/NetworkSelectorActivity.java
index 59f3b0631034..65279da5eba3 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/NetworkSelectorActivity.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/NetworkSelectorActivity.java
@@ -141,8 +141,9 @@ private void launchAddNetwork() {
Bundle fragmentArgs = new Bundle();
fragmentArgs.putString(ADD_NETWORK_FRAGMENT_ARG_CHAIN_ID, "");
fragmentArgs.putBoolean(ADD_NETWORK_FRAGMENT_ARG_ACTIVE_NETWORK, false);
- Intent intent = mSettingsLauncher.createSettingsActivityIntent(
- this, BraveWalletAddNetworksFragment.class.getName(), fragmentArgs);
+ Intent intent =
+ mSettingsLauncher.createSettingsActivityIntent(
+ this, BraveWalletAddNetworksFragment.class, fragmentArgs);
startActivity(intent);
}
diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java
index 654ca4ce4cad..da6bfcfb5bf3 100644
--- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java
+++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java
@@ -38,6 +38,7 @@
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
import org.chromium.components.search_engines.TemplateUrlService;
import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.modaldialog.ModalDialogManager;
public class BraveNewTabPage extends NewTabPage {
private JankTracker mJankTracker;
@@ -54,6 +55,7 @@ public BraveNewTabPage(
Activity activity,
BrowserControlsStateProvider browserControlsStateProvider,
Supplier activityTabProvider,
+ ModalDialogManager modalDialogManager,
SnackbarManager snackbarManager,
ActivityLifecycleDispatcher lifecycleDispatcher,
TabModelSelector tabModelSelector,
@@ -76,6 +78,7 @@ public BraveNewTabPage(
activity,
browserControlsStateProvider,
activityTabProvider,
+ modalDialogManager,
snackbarManager,
lifecycleDispatcher,
tabModelSelector,
diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
index af81949297f4..796d6c13040b 100644
--- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
+++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
@@ -72,7 +72,6 @@
import org.chromium.chrome.browser.brave_news.models.FeedItemsCard;
import org.chromium.chrome.browser.brave_stats.BraveStatsUtil;
import org.chromium.chrome.browser.feed.FeedSurfaceScrollDelegate;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.local_database.DatabaseHelper;
import org.chromium.chrome.browser.local_database.TopSiteTable;
@@ -98,7 +97,7 @@
import org.chromium.chrome.browser.settings.BackgroundImagesPreferences;
import org.chromium.chrome.browser.settings.BraveNewsPreferencesV2;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
-import org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesGridLayout;
+import org.chromium.chrome.browser.suggestions.tile.BraveMostVisitedTilesLayoutBase;
import org.chromium.chrome.browser.suggestions.tile.TileGroup.Delegate;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabAttributes;
@@ -109,7 +108,6 @@
import org.chromium.components.user_prefs.UserPrefs;
import org.chromium.mojo.bindings.ConnectionErrorHandler;
import org.chromium.mojo.system.MojoException;
-import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.base.WindowAndroid;
import java.util.ArrayList;
@@ -129,12 +127,14 @@ public class BraveNewTabPageLayout
// To delete in bytecode, parent variable will be used instead.
private ViewGroup mMvTilesContainerLayout;
private LogoCoordinator mLogoCoordinator;
+ private Integer mInitialTileNum;
// Own members.
private final Context mContext;
private ImageView mBgImageView;
private Profile mProfile;
private SponsoredTab mSponsoredTab;
+ private boolean mIsTablet;
private BitmapDrawable mImageDrawable;
@@ -241,29 +241,45 @@ public void checkForBraveStats() {
protected void insertSiteSectionView() {
mMainLayout = findViewById(R.id.ntp_content);
- mMvTilesContainerLayout = (ViewGroup) LayoutInflater.from(mMainLayout.getContext())
- .inflate(R.layout.mv_tiles_container, mMainLayout, false);
+ mMvTilesContainerLayout =
+ (ViewGroup)
+ LayoutInflater.from(mMainLayout.getContext())
+ .inflate(R.layout.mv_tiles_container, mMainLayout, false);
+ mMvTilesContainerLayout.setPadding(0, 0, 0, 0);
mMvTilesContainerLayout.setVisibility(View.VISIBLE);
- mMvTilesContainerLayout.post(new Runnable() {
- @Override
- public void run() {
- mMvTilesContainerLayout.addOnLayoutChangeListener(
- (View view, int left, int top, int right, int bottom, int oldLeft,
- int oldTop, int oldRight, int oldBottom) -> {
- int oldHeight = oldBottom - oldTop;
- int newHeight = bottom - top;
-
- if (oldHeight != newHeight && mIsTopSitesEnabled
- && mNtpAdapter != null) {
- new Handler(Looper.getMainLooper()).post(() -> {
- mNtpAdapter.notifyItemRangeChanged(mNtpAdapter.getStatsCount(),
- mNtpAdapter.getNewContentCount() + 2);
+ mMvTilesContainerLayout.post(
+ new Runnable() {
+ @Override
+ public void run() {
+ mMvTilesContainerLayout.addOnLayoutChangeListener(
+ (View view,
+ int left,
+ int top,
+ int right,
+ int bottom,
+ int oldLeft,
+ int oldTop,
+ int oldRight,
+ int oldBottom) -> {
+ int oldHeight = oldBottom - oldTop;
+ int newHeight = bottom - top;
+
+ if (oldHeight != newHeight
+ && mIsTopSitesEnabled
+ && mNtpAdapter != null) {
+ new Handler(Looper.getMainLooper())
+ .post(
+ () -> {
+ mNtpAdapter.notifyItemRangeChanged(
+ mNtpAdapter.getStatsCount(),
+ mNtpAdapter.getNewContentCount()
+ + 2);
+ });
+ }
});
- }
- });
- }
- });
+ }
+ });
// The page contents are initially hidden; otherwise they'll be drawn centered on the
// page before the tiles are available and then jump upwards to make space once the
@@ -1189,17 +1205,18 @@ public void initialize(
isTablet,
tabStripHeightSupplier);
+ mIsTablet = isTablet;
+
assert mMvTilesContainerLayout != null : "Something has changed in the upstream!";
- if (mMvTilesContainerLayout != null && !isScrollableMvtEnabled()) {
+ if (mMvTilesContainerLayout != null && useFixedMVTLayout()) {
ViewGroup tilesLayout = mMvTilesContainerLayout.findViewById(R.id.mv_tiles_layout);
- assert tilesLayout instanceof MostVisitedTilesGridLayout
+ assert tilesLayout instanceof BraveMostVisitedTilesLayoutBase
: "Something has changed in the upstream!";
- if (tilesLayout instanceof MostVisitedTilesGridLayout) {
- ((MostVisitedTilesGridLayout) tilesLayout)
- .setMaxRows(getMaxRowsForMostVisitedTiles());
+ if (tilesLayout instanceof BraveMostVisitedTilesLayoutBase) {
+ ((BraveMostVisitedTilesLayoutBase) tilesLayout).setUseFixedLayout(true);
}
}
@@ -1209,6 +1226,11 @@ public void initialize(
((BraveActivity) mActivity).setNewTabPageManager(manager);
}
+ protected boolean useFixedMVTLayout() {
+ return !UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
+ .getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE);
+ }
+
public void setTabProvider(Supplier tabProvider) {
mTabProvider = tabProvider;
}
@@ -1471,13 +1493,6 @@ private void initBraveNewsController() {
}
}
- protected boolean isScrollableMvtEnabled() {
- return ChromeFeatureList.isEnabled(ChromeFeatureList.SHOW_SCROLLABLE_MVT_ON_NTP_ANDROID)
- && !DeviceFormFactor.isNonMultiDisplayContextOnTablet(mContext)
- && UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
- .getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE);
- }
-
private int getMaxRowsForMostVisitedTiles() {
try {
if (!ProfileManager.isInitialized()
@@ -1493,4 +1508,23 @@ private int getMaxRowsForMostVisitedTiles() {
return 2;
}
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ if (mIsTablet) {
+ if (mInitialTileNum == null) {
+ // In the upstream `mMvTilesContainerLayout` is added as a view in
+ // `insertSiteSectionView`.
+ // We override `insertSiteSectionView` to add `mMvTilesContainerLayout` in our own
+ // RecyclerView to have own NTP UI.
+ // Thus upstream's NewTabPageLayout.findViewById does not see `mv_tiles_layout` and
+ // returns null.
+ mInitialTileNum =
+ ((ViewGroup) mMvTilesContainerLayout.findViewById(R.id.mv_tiles_layout))
+ .getChildCount();
+ }
+ }
+
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
}
diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java
index aa41f86047d5..6f8d5d50a046 100644
--- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java
@@ -81,9 +81,8 @@ public BraveLocationBarCoordinator(
merchantTrustSignalsCoordinatorSupplier,
@NonNull OmniboxActionDelegate omniboxActionDelegate,
BrowserStateBrowserControlsVisibilityDelegate browserControlsVisibilityDelegate,
- Callback reportExceptionCallback,
@Nullable BackPressManager backPressManager,
- @NonNull
+ @Nullable
OmniboxSuggestionsDropdownScrollListener
omniboxSuggestionsDropdownScrollListener,
@Nullable ObservableSupplier tabModelSelectorSupplier,
@@ -115,7 +114,6 @@ public BraveLocationBarCoordinator(
merchantTrustSignalsCoordinatorSupplier,
omniboxActionDelegate,
browserControlsVisibilityDelegate,
- reportExceptionCallback,
backPressManager,
omniboxSuggestionsDropdownScrollListener,
tabModelSelectorSupplier,
diff --git a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
index 2fa92905b7b0..f76ff309271c 100644
--- a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
+++ b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
@@ -17,6 +17,7 @@
import org.chromium.chrome.browser.brave_leo.BraveLeoPrefUtils;
import org.chromium.chrome.browser.brave_leo.BraveLeoUtils;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
+import org.chromium.chrome.browser.omnibox.DeferredIMEWindowInsetApplicationCallback;
import org.chromium.chrome.browser.omnibox.LocationBarDataProvider;
import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider;
import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
@@ -71,7 +72,10 @@ public BraveAutocompleteMediator(
@NonNull OmniboxActionDelegate omniboxActionDelegate,
@NonNull ActivityLifecycleDispatcher lifecycleDispatcher,
@NonNull OmniboxSuggestionsDropdownEmbedder embedder,
- WindowAndroid windowAndroid) {
+ @NonNull WindowAndroid windowAndroid,
+ @NonNull
+ DeferredIMEWindowInsetApplicationCallback
+ deferredIMEWindowInsetApplicationCallback) {
super(
context,
delegate,
@@ -88,7 +92,8 @@ public BraveAutocompleteMediator(
omniboxActionDelegate,
lifecycleDispatcher,
embedder,
- windowAndroid);
+ windowAndroid,
+ deferredIMEWindowInsetApplicationCallback);
mContext = context;
mDelegate = delegate;
diff --git a/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java b/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java
index 9eaf88201184..eda76592a23f 100644
--- a/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java
+++ b/android/java/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderActivity.java
@@ -9,7 +9,7 @@
import android.content.Intent;
import org.chromium.base.IntentUtils;
-import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient;
+import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras;
public class SearchWidgetProviderActivity extends SearchActivity {
@Override
@@ -23,9 +23,9 @@ public void onNewIntent(Intent intent) {
int searchType =
IntentUtils.safeGetInt(
- intent.getExtras(), SearchActivityUtils.EXTRA_SEARCH_TYPE, -1);
- if (searchType == SearchActivityClient.SearchType.TEXT) {
- newIntent.putExtra(SearchActivityUtils.EXTRA_SEARCH_TYPE, searchType);
+ intent.getExtras(), SearchActivityExtras.EXTRA_SEARCH_TYPE, -1);
+ if (searchType == SearchActivityExtras.SearchType.TEXT) {
+ newIntent.putExtra(SearchActivityExtras.EXTRA_SEARCH_TYPE, searchType);
}
super.onNewIntent(newIntent);
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java b/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java
index 631ad3b8c7ba..e92ba9a34ff4 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java
@@ -39,15 +39,17 @@ public void launchSettingsActivity(Context context,
@Override
public Intent createSettingsActivityIntent(
- Context context, @Nullable String fragmentName, @Nullable Bundle fragmentArgs) {
- Intent intent = super.createSettingsActivityIntent(context, fragmentName, fragmentArgs);
+ Context context,
+ @Nullable Class fragment,
+ @Nullable Bundle fragmentArgs) {
+ Intent intent = super.createSettingsActivityIntent(context, fragment, fragmentArgs);
intent.setClass(context, BraveSettingsActivity.class);
if (!(context instanceof Activity)) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
}
- if (fragmentName != null) {
- intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, fragmentName);
+ if (fragment != null) {
+ intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, fragment.getName());
}
if (fragmentArgs != null) {
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, fragmentArgs);
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveWalletNetworksPreferenceFragment.java b/android/java/org/chromium/chrome/browser/settings/BraveWalletNetworksPreferenceFragment.java
index 4f481e3bf4de..3404bc66156c 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveWalletNetworksPreferenceFragment.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveWalletNetworksPreferenceFragment.java
@@ -134,9 +134,7 @@ private void launchIntent(@Nullable final String chainId, boolean activeNetwork)
}
Intent intent =
mSettingsLauncher.createSettingsActivityIntent(
- requireContext(),
- BraveWalletAddNetworksFragment.class.getName(),
- fragmentArgs);
+ requireContext(), BraveWalletAddNetworksFragment.class, fragmentArgs);
mAddNetworkActivityResultLauncher.launch(intent);
}
}
diff --git a/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java b/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java
index 1a48961c38e4..b2a838e12bc6 100644
--- a/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java
+++ b/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java
@@ -134,8 +134,9 @@ public void onAddSubscriptionFilter() {
if (mSubscriptionFilterLists.size() > 0) {
isEditSelected(false);
}
- Intent intent = mSettingsLauncher.createSettingsActivityIntent(
- getActivity(), AddCustomFilterListsFragment.class.getName(), null);
+ Intent intent =
+ mSettingsLauncher.createSettingsActivityIntent(
+ getActivity(), AddCustomFilterListsFragment.class, null);
mAddCustomFilterResultLauncher.launch(intent);
}
@@ -158,7 +159,7 @@ public void onCustomFilters() {
}
Intent intent =
mSettingsLauncher.createSettingsActivityIntent(
- getActivity(), CreateCustomFiltersFragment.class.getName(), null);
+ getActivity(), CreateCustomFiltersFragment.class, null);
getActivity().startActivity(intent);
}
diff --git a/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesLayoutBase.java b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesLayoutBase.java
new file mode 100644
index 000000000000..4821e278c731
--- /dev/null
+++ b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesLayoutBase.java
@@ -0,0 +1,57 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.suggestions.tile;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.GridLayout;
+
+/** The most visited tiles layout. */
+public class BraveMostVisitedTilesLayoutBase extends GridLayout {
+ private static int FIXED_COLUMNS_COUNT = 4;
+
+ private boolean mUseFixedLayout;
+
+ /** Constructor for inflating from XML. */
+ public BraveMostVisitedTilesLayoutBase(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public void setUseFixedLayout(boolean useFixedLayout) {
+ mUseFixedLayout = useFixedLayout;
+ }
+
+ @SuppressLint("DrawAllocation")
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ int childCount = getChildCount();
+ if (mUseFixedLayout && widthMeasureSpec > 0 && childCount > FIXED_COLUMNS_COUNT) {
+ int numColumns = FIXED_COLUMNS_COUNT;
+ if (getColumnCount() < numColumns) {
+ setColumnCount(numColumns);
+ }
+ int numRows = (childCount / numColumns) + 1;
+ if (getRowCount() < numRows) {
+ setRowCount(numRows);
+ }
+ int tileViewWidth = widthMeasureSpec / numColumns;
+ for (int i = 0; i < childCount; i++) {
+ SuggestionsTileView tileView = (SuggestionsTileView) getChildAt(i);
+ int row = i / numColumns;
+ int column = i % numColumns;
+ GridLayout.LayoutParams params =
+ new GridLayout.LayoutParams(
+ GridLayout.spec(row, GridLayout.CENTER, 1),
+ GridLayout.spec(column, GridLayout.CENTER, 1));
+ params.width = tileViewWidth;
+ updateViewLayout(tileView, params);
+ }
+ }
+
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+}
diff --git a/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java
index 12a0f1a24ec3..18e65800d5b1 100644
--- a/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java
+++ b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java
@@ -6,7 +6,6 @@
package org.chromium.chrome.browser.suggestions.tile;
import android.content.res.Resources;
-import android.view.ViewGroup;
import android.view.ViewStub;
import androidx.annotation.Nullable;
@@ -21,11 +20,10 @@ public class BraveMostVisitedTilesMediator extends MostVisitedTilesMediator {
public BraveMostVisitedTilesMediator(
Resources resources,
UiConfig uiConfig,
- ViewGroup mvTilesLayout,
+ MostVisitedTilesLayout mvTilesLayout,
ViewStub noMvPlaceholderStub,
TileRenderer renderer,
PropertyModel propertyModel,
- boolean isScrollableMVTEnabled,
boolean isTablet,
@Nullable Runnable snapshotTileGridChangedRunnable,
@Nullable Runnable tileCountChangedRunnable) {
@@ -36,7 +34,6 @@ public BraveMostVisitedTilesMediator(
noMvPlaceholderStub,
renderer,
propertyModel,
- isScrollableMVTEnabled,
isTablet,
snapshotTileGridChangedRunnable,
tileCountChangedRunnable);
diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java
index 1c7c769cd127..0e0b6991132f 100644
--- a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java
@@ -31,6 +31,7 @@
import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
import org.chromium.chrome.browser.fullscreen.FullscreenManager;
import org.chromium.chrome.browser.hub.HubManager;
+import org.chromium.chrome.browser.keyboard_accessory.ManualFillingComponentSupplier;
import org.chromium.chrome.browser.layouts.LayoutStateProvider;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
@@ -48,8 +49,8 @@
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider;
import org.chromium.chrome.features.start_surface.StartSurface;
-import org.chromium.components.browser_ui.widget.InsetObserver;
import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController;
+import org.chromium.ui.InsetObserver;
import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.modaldialog.ModalDialogManager;
@@ -101,8 +102,7 @@ public BraveTabbedRootUiCoordinator(
@NonNull
ObservableSupplierImpl ephemeralTabCoordinatorSupplier,
@NonNull IntentRequestTracker intentRequestTracker,
- int controlContainerHeightResource,
- @NonNull Supplier insetObserverViewSupplier,
+ @NonNull InsetObserver insetObserver,
@NonNull Function backButtonShouldCloseTabFn,
OneshotSupplier tabReparentingControllerSupplier,
boolean initializeUiWithIncognitoColors,
@@ -110,7 +110,8 @@ public BraveTabbedRootUiCoordinator(
@Nullable Bundle savedInstanceState,
@Nullable MultiInstanceManager multiInstanceManager,
@Nullable ObservableSupplier overviewColorSupplier,
- @Nullable View baseChromeLayout) {
+ @Nullable View baseChromeLayout,
+ @NonNull ManualFillingComponentSupplier manualFillingComponentSupplier) {
super(
activity,
onOmniboxFocusChangedListener,
@@ -151,8 +152,7 @@ public BraveTabbedRootUiCoordinator(
statusBarColorProvider,
ephemeralTabCoordinatorSupplier,
intentRequestTracker,
- controlContainerHeightResource,
- insetObserverViewSupplier,
+ insetObserver,
backButtonShouldCloseTabFn,
tabReparentingControllerSupplier,
initializeUiWithIncognitoColors,
@@ -160,7 +160,8 @@ public BraveTabbedRootUiCoordinator(
savedInstanceState,
multiInstanceManager,
overviewColorSupplier,
- baseChromeLayout);
+ baseChromeLayout,
+ manualFillingComponentSupplier);
mActivity = activity;
}
diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
index 7252a1b4e19f..577456ee8827 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
@@ -28,7 +28,8 @@
import org.chromium.chrome.browser.back_press.BackPressManager;
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
import org.chromium.chrome.browser.brave_leo.BraveLeoActivity;
-import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer;
+import org.chromium.chrome.browser.browser_controls.BottomControlsStacker;
+import org.chromium.chrome.browser.browser_controls.BrowserControlsVisibilityManager;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
@@ -87,7 +88,7 @@ public class BraveToolbarManager extends ToolbarManager {
// To delete in bytecode, members from parent class will be used instead.
private ObservableSupplierImpl mBottomControlsCoordinatorSupplier;
private CallbackController mCallbackController;
- private BrowserControlsSizer mBrowserControlsSizer;
+ private BottomControlsStacker mBottomControlsStacker;
private FullscreenManager mFullscreenManager;
private ActivityTabProvider mActivityTabProvider;
private AppThemeColorProvider mAppThemeColorProvider;
@@ -129,10 +130,13 @@ public class BraveToolbarManager extends ToolbarManager {
private boolean mBottomControlsEnabled;
private BraveScrollingBottomViewResourceFrameLayout mBottomControls;
private ObservableSupplier mEdgeToEdgeControllerSupplier;
+ private ObservableSupplier mProfileSupplier;
+ private BrowserControlsVisibilityManager mBrowserControlsVisibilityManager;
public BraveToolbarManager(
AppCompatActivity activity,
- BrowserControlsSizer controlsSizer,
+ BottomControlsStacker bottomControlsStacker,
+ BrowserControlsVisibilityManager controlsVisibilityManager,
FullscreenManager fullscreenManager,
ObservableSupplier edgeToEdgeControllerSupplier,
ToolbarControlContainer controlContainer,
@@ -183,7 +187,8 @@ public BraveToolbarManager(
@Nullable DesktopWindowStateProvider desktopWindowStateProvider) {
super(
activity,
- controlsSizer,
+ bottomControlsStacker,
+ controlsVisibilityManager,
fullscreenManager,
edgeToEdgeControllerSupplier,
controlContainer,
@@ -237,6 +242,8 @@ public BraveToolbarManager(
mWindowAndroid = windowAndroid;
mCompositorViewHolder = compositorViewHolder;
mEdgeToEdgeControllerSupplier = edgeToEdgeControllerSupplier;
+ mProfileSupplier = profileSupplier;
+ mBrowserControlsVisibilityManager = controlsVisibilityManager;
if (isToolbarPhone()) {
updateBottomToolbarVisibility();
@@ -275,7 +282,7 @@ public void enableBottomControls() {
.createTabGroupUi(
mActivity,
mBottomControls.findViewById(R.id.bottom_container_slot),
- mBrowserControlsSizer,
+ mBrowserControlsVisibilityManager,
mIncognitoStateProvider,
mScrimCoordinator,
mOmniboxFocusStateSupplier,
@@ -296,7 +303,8 @@ public void enableBottomControls() {
BottomTabSwitcherActionMenuCoordinator.createOnLongClickListener(
id ->
((ChromeActivity) mActivity)
- .onOptionsItemSelected(id, null)),
+ .onOptionsItemSelected(id, null),
+ mProfileSupplier.get()),
mActivityTabProvider,
mToolbarTabController::openHomepage,
mCallbackController.makeCancelable(
@@ -310,7 +318,7 @@ public void enableBottomControls() {
mWindowAndroid,
mLayoutManager,
mCompositorViewHolder.getResourceManager(),
- mBrowserControlsSizer,
+ mBottomControlsStacker,
mFullscreenManager,
mEdgeToEdgeControllerSupplier,
mBottomControls,
@@ -488,6 +496,7 @@ private ObservableSupplier getConstraintsProxy() {
return null;
}
+ @Override
public LocationBar getLocationBar() {
return mLocationBar;
}
diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java
index d29c3fddae1b..a6f619cb5161 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java
@@ -20,7 +20,7 @@
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
-import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer;
+import org.chromium.chrome.browser.browser_controls.BottomControlsStacker;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
import org.chromium.chrome.browser.fullscreen.FullscreenManager;
import org.chromium.chrome.browser.layouts.LayoutManager;
@@ -67,7 +67,7 @@ public BraveBottomControlsCoordinator(
WindowAndroid windowAndroid,
LayoutManager layoutManager,
ResourceManager resourceManager,
- BrowserControlsSizer controlsSizer,
+ BottomControlsStacker controlsStacker,
FullscreenManager fullscreenManager,
ObservableSupplier edgeToEdgeControllerSupplier,
ScrollingBottomViewResourceFrameLayout root,
@@ -81,7 +81,7 @@ public BraveBottomControlsCoordinator(
windowAndroid,
layoutManager,
resourceManager,
- controlsSizer,
+ controlsStacker,
fullscreenManager,
edgeToEdgeControllerSupplier,
root,
diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTopToolbar.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTopToolbar.java
index 3bbb02b3d747..fbca03e50fbb 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTopToolbar.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTopToolbar.java
@@ -8,11 +8,16 @@
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.FrameLayout;
import org.chromium.chrome.browser.toolbar.NewTabButton;
+import org.chromium.chrome.browser.toolbar.R;
import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager;
import org.chromium.components.browser_ui.styles.ChromeColors;
+import org.chromium.ui.base.DeviceFormFactor;
public class BraveTabSwitcherModeTopToolbar extends TabSwitcherModeTopToolbar {
// To delete in bytecode, members from parent class will be used instead.
@@ -23,9 +28,34 @@ public class BraveTabSwitcherModeTopToolbar extends TabSwitcherModeTopToolbar {
// Own members.
private boolean mShouldShowNewTabButton;
+ private boolean mIsTablet;
+ private int mToolbarHeight;
public BraveTabSwitcherModeTopToolbar(Context context, AttributeSet attrs) {
super(context, attrs);
+
+ mIsTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(context);
+ // Tablets don't have bottom toolbar and thus should always show new tab button.
+ mShouldShowNewTabButton = mIsTablet;
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+ if (mIsTablet && mToolbarHeight == 0) {
+ mToolbarHeight = getMeasuredHeight();
+ maybeUpdateEmptyStateView();
+ }
+ }
+
+ @Override
+ void setTabSwitcherMode(boolean inTabSwitcherMode) {
+ super.setTabSwitcherMode(inTabSwitcherMode);
+
+ if (mIsTablet && inTabSwitcherMode && mToolbarHeight != 0) {
+ maybeUpdateEmptyStateView();
+ }
}
protected void updateNewTabButtonVisibility() {
@@ -45,9 +75,12 @@ protected boolean shouldShowIncognitoToggle() {
}
void onBottomToolbarVisibilityChanged(boolean isVisible) {
- mShouldShowNewTabButton = !isVisible
- || (BottomToolbarConfiguration.isBottomToolbarEnabled()
- && !BottomToolbarVariationManager.isNewTabButtonOnBottom());
+ if (mIsTablet) return;
+
+ mShouldShowNewTabButton =
+ !isVisible
+ || (BottomToolbarConfiguration.isBottomToolbarEnabled()
+ && !BottomToolbarVariationManager.isNewTabButtonOnBottom());
updateNewTabButtonVisibility();
}
@@ -56,4 +89,22 @@ public int getToolbarColorForCurrentState() {
// browsing mode is still visible in tab switching mode with stack layout.
return ChromeColors.getPrimaryBackgroundColor(getContext(), mIsIncognito);
}
+
+ private void maybeUpdateEmptyStateView() {
+ if (!mIsTablet) return;
+
+ // Adjust empty state view top margin to not cover the top toolbar and keep its buttons
+ // clickable.
+ ViewParent parentView = getParent();
+ assert parentView instanceof ViewGroup : "Something has changed in the upstream code!";
+ if (parentView instanceof ViewGroup) {
+ View emptyView = ((ViewGroup) parentView).findViewById(R.id.empty_state_container);
+ if (emptyView != null) {
+ FrameLayout.LayoutParams emptyViewParams =
+ (FrameLayout.LayoutParams) emptyView.getLayoutParams();
+ emptyViewParams.topMargin = mToolbarHeight;
+ emptyView.setLayoutParams(emptyViewParams);
+ }
+ }
+ }
}
diff --git a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java
index efb3d5e226a9..d6ec7e014ecd 100644
--- a/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java
+++ b/android/java/org/chromium/chrome/browser/widget/quickactionsearchandbookmark/QuickActionSearchAndBookmarkWidgetProvider.java
@@ -49,12 +49,13 @@
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileManager;
import org.chromium.chrome.browser.searchwidget.SearchActivity;
-import org.chromium.chrome.browser.searchwidget.SearchActivityUtils;
+import org.chromium.chrome.browser.searchwidget.SearchActivityClientImpl;
import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
import org.chromium.chrome.browser.settings.BraveSearchEngineUtils;
import org.chromium.chrome.browser.suggestions.tile.Tile;
import org.chromium.chrome.browser.ui.favicon.FaviconUtils;
import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient;
+import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras;
import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager;
import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager.SearchActivityPreferences;
import org.chromium.chrome.browser.widget.quickactionsearchandbookmark.utils.BraveSearchWidgetUtils;
@@ -432,15 +433,15 @@ private static PendingIntent createIntent(@NonNull Context context, @NonNull Str
}
private static PendingIntent createIntent(@NonNull Context context, boolean startVoiceSearch) {
- SearchActivityClient client = new SearchActivityUtils();
+ SearchActivityClient client = new SearchActivityClientImpl();
Intent searchIntent =
client.createIntent(
context,
- SearchActivityClient.IntentOrigin.SEARCH_WIDGET,
+ SearchActivityExtras.IntentOrigin.SEARCH_WIDGET,
null,
startVoiceSearch
- ? SearchActivityClient.SearchType.VOICE
- : SearchActivityClient.SearchType.TEXT);
+ ? SearchActivityExtras.SearchType.VOICE
+ : SearchActivityExtras.SearchType.TEXT);
searchIntent.putExtra(SearchWidgetProvider.EXTRA_FROM_SEARCH_WIDGET, true);
searchIntent.setComponent(new ComponentName(context, SearchActivity.class));
diff --git a/android/java/res/drawable/chrome_logo_on_circular_background.xml b/android/java/res/drawable/chrome_logo_on_circular_background.xml
new file mode 100644
index 000000000000..d89697f26ac4
--- /dev/null
+++ b/android/java/res/drawable/chrome_logo_on_circular_background.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+