Uplift of #25923 (squashed) to release

brave · Oct 11, 2024 · f762ece · f762ece
1 parent 7d51df6
commit f762ece
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
@@ -894,6 +894,7 @@
 
 -keep class org.chromium.chrome.browser.tabbed_mode.TabbedNavigationBarColorController {
     *** mContext;
+    *** mTabModelSelector;
 }
 
 -keep class org.chromium.chrome.browser.tabbed_mode.BraveTabbedNavigationBarColorControllerBase

diff --git a/.../org/chromium/chrome/browser/tabbed_mode/BraveTabbedNavigationBarColorControllerBase.java b/.../org/chromium/chrome/browser/tabbed_mode/BraveTabbedNavigationBarColorControllerBase.java
@@ -9,10 +9,12 @@
 import android.os.Build;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
 import org.chromium.base.BraveReflectionUtil;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
 import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator;
 
@@ -23,7 +25,9 @@ class BraveTabbedNavigationBarColorControllerBase {
      * This variable will be used instead of `TabGroupModelFilter#mContext`, that will be deleted in
      * bytecode.
      */
-    protected Context mContext;
+    protected @Nullable Context mContext;
+
+    protected @Nullable TabModelSelector mTabModelSelector;
 
     // Calls from the upstream's private function
     // `TabbedNavigationBarColorController#getNavigationBarColor`
@@ -33,8 +37,13 @@ public int getNavigationBarColor(boolean forceDarkNavigationBar) {
         // Adjust navigation bar color to match the bottom toolbar color when it is visible.
         if (BottomToolbarConfiguration.isBottomToolbarEnabled()
                 && BraveMenuButtonCoordinator.isMenuFromBottom()
-                && mContext != null) {
-            return mContext.getColor(R.color.default_bg_color_baseline);
+                && mContext != null
+                && mTabModelSelector != null) {
+            if (mTabModelSelector.isIncognitoSelected()) {
+                return mContext.getColor(R.color.toolbar_background_primary_dark);
+            } else {
+                return mContext.getColor(R.color.default_bg_color_baseline);
+            }
         }
 
         // Otherwise just call upstream's method.

diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml
@@ -100,6 +100,7 @@
     <color name="systemfeedback_info_text">#0061aa</color>
     <color name="text_interactive">#3f39e8</color>
     <color name="container_background">#ffffff</color>
+    <color name="primitive_private_window_5">#160041</color>
 
     <!-- Sync colors -->
     <color name="brave_sync_bg_color">@android:color/transparent</color>
@@ -143,6 +144,7 @@
     <color name="news_settings_unfollow_color">#4C54D2</color>
 
     <!-- Incognito mode colors -->
+    <color name="toolbar_background_primary_dark">@color/primitive_private_window_5</color>
     <color name="ntp_bg_incognito">@color/incognito_modern_primary_color</color>
     <color name="brave_private_tabs_bg_color">#13052A</color>
     <color name="brave_private_reauth_unlock_button_bg_color">#4B415D</color>

diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -2108,6 +2108,10 @@ public void testFieldsExist() throws Exception {
                 fieldExists(
                         "org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorController", // presubmit: ignore-long-line
                         "mContext"));
+        Assert.assertFalse(
+                fieldExists(
+                        "org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorController", // presubmit: ignore-long-line
+                        "mTabModelSelector"));
     }
 
     @Test

diff --git a/...code/java/org/brave/bytecode/BraveTabbedNavigationBarColorControllerBaseClassAdapter.java b/...code/java/org/brave/bytecode/BraveTabbedNavigationBarColorControllerBaseClassAdapter.java
@@ -22,6 +22,8 @@ public BraveTabbedNavigationBarColorControllerBaseClassAdapter(ClassVisitor visi
 
         deleteField(sTabbedNavigationBarColorControllerClassName, "mContext");
 
+        deleteField(sTabbedNavigationBarColorControllerClassName, "mTabModelSelector");
+
         changeMethodOwner(
                 sTabbedNavigationBarColorControllerClassName,
                 "getNavigationBarColor",