From c4f349788ffa8bcd2463382d38875a7abce4e104 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Thu, 25 Apr 2024 15:29:20 -0400 Subject: [PATCH 1/2] [Android] Fixes for search engine and UI issues on cold opening of the Private tab --- .../chromium/chrome/browser/app/BraveActivity.java | 5 +---- .../BrowsingModeBottomToolbarCoordinator.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 118b39522fa..5d019dcc29c 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -165,7 +165,6 @@ import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabLaunchType; import org.chromium.chrome.browser.tab.TabSelectionType; import org.chromium.chrome.browser.tabmodel.TabModel; -import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.TabModelUtils; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayoutImpl; @@ -806,6 +805,7 @@ public abstract class BraveActivity extends ChromeActivity setLoadedFeed(false); setComesFromNewTab(false); setNewsItemsFeedCards(null); + BraveSearchEngineUtils.initializeBraveSearchEngineStates(getTabModelSelector()); Intent intent = getIntent(); if (intent != null && intent.getBooleanExtra(BraveWalletActivity.RESTART_WALLET_ACTIVITY, false)) { @@ -953,9 +953,6 @@ public abstract class BraveActivity extends ChromeActivity boolean isFirstInstall = PackageUtils.isFirstInstall(this); - BraveSearchEngineUtils.initializeBraveSearchEngineStates( - (TabModelSelector) getTabModelSelectorSupplier().get()); - BraveVpnNativeWorker.getInstance().reloadPurchasedState(); BraveHelper.maybeMigrateSettings(); diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index dc52d6258b3..681cbe434c2 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -11,6 +11,7 @@ import android.view.View.OnLongClickListener; import org.chromium.base.Callback; import org.chromium.base.CallbackController; +import org.chromium.base.ContextUtils; import org.chromium.base.Log; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneShotCallback; @@ -31,6 +32,7 @@ import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonState; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.chrome.browser.util.BraveTouchUtils; +import org.chromium.components.browser_ui.styles.ChromeColors; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; /** @@ -184,14 +186,23 @@ public class BrowsingModeBottomToolbarCoordinator { } mThemeColorProvider = themeColorProvider; mMediator.setThemeColorProvider(themeColorProvider); + if (incognitoStateProvider.isIncognitoSelected()) { + mMediator.onThemeColorChanged( + ChromeColors.getDefaultThemeColor(ContextUtils.getApplicationContext(), true), + false); + } if (BottomToolbarVariationManager.isNewTabButtonOnBottom()) { mNewTabButton.setOnClickListener(newTabListener); mNewTabButton.setThemeColorProvider(themeColorProvider); mNewTabButton.setIncognitoStateProvider(incognitoStateProvider); + mNewTabButton.onTintChanged( + mThemeColorProvider.getTint(), mThemeColorProvider.getBrandedColorScheme()); } if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { mBraveHomeButton.setThemeColorProvider(themeColorProvider); + mBraveHomeButton.onTintChanged( + mThemeColorProvider.getTint(), mThemeColorProvider.getBrandedColorScheme()); } mSearchAccelerator.setThemeColorProvider(themeColorProvider); @@ -211,6 +222,8 @@ public class BrowsingModeBottomToolbarCoordinator { mThemeColorProvider.getTint(), mThemeColorProvider.getBrandedColorScheme()); mThemeColorProvider.addTintObserver(mMenuButton); + mMenuButton.onTintChanged( + mThemeColorProvider.getTint(), mThemeColorProvider.getBrandedColorScheme()); new OneShotCallback<>( menuButtonHelperSupplier, From c5ebd29cf98b777eaf4777b5ba644a1a1e1d86cf Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Thu, 25 Apr 2024 16:53:57 -0400 Subject: [PATCH 2/2] Presubmit fixes --- .../bottom/BrowsingModeBottomToolbarCoordinator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index 681cbe434c2..d968eec5f74 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -36,9 +36,9 @@ import org.chromium.components.browser_ui.styles.ChromeColors; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; /** - * The coordinator for the browsing mode bottom toolbar. This class has two primary components, - * an Android view that handles user actions and a composited texture that draws when the controls - * are being scrolled off-screen. The Android version does not draw unless the controls offset is 0. + * The coordinator for the browsing mode bottom toolbar. This class has two primary components, an + * Android view that handles user actions and a composited texture that draws when the controls are + * being scrolled off-screen. The Android version does not draw unless the controls offset is 0. */ public class BrowsingModeBottomToolbarCoordinator { private static final String TAG = "BrowsingMode";