Merge pull request #23288 from brave/android_cold_private_tab_opening_fix

[Android] Fixes for search engine and UI issues on cold opening of th…

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -168,7 +168,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;
@@ -809,6 +808,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)) {
@@ -956,9 +956,6 @@ public abstract class BraveActivity extends ChromeActivity
 
         boolean isFirstInstall = PackageUtils.isFirstInstall(this);
 
-        BraveSearchEngineUtils.initializeBraveSearchEngineStates(
-                (TabModelSelector) getTabModelSelectorSupplier().get());
-
         BraveVpnNativeWorker.getInstance().reloadPurchasedState();
 
         BraveHelper.maybeMigrateSettings();

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,12 +32,13 @@ 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;
 
 /**
- * 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";
@@ -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,