diff --git a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider.java b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider.java index 7c35287577b..7292bae9a71 100644 --- a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider.java +++ b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider.java @@ -33,4 +33,15 @@ public class BraveTabUiThemeProvider { return TabUiThemeProvider.getActionButtonTintList(context, isIncognito, isSelected); } + + @ColorInt + public static int getCardViewBackgroundColor( + Context context, boolean isIncognito, boolean isSelected) { + if (isSelected && !isIncognito) { + return ApiCompatibilityUtils.getColor( + context.getResources(), R.color.brave_tab_view_card_selected_bg); + } + + return TabUiThemeProvider.getCardViewBackgroundColor(context, isIncognito, isSelected); + } } diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 56951927d58..a2d8b183d53 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -429,11 +429,13 @@ -keep class org.chromium.chrome.browser.tasks.tab_management.TabUiThemeProvider { *** getTitleTextColor(...); *** getActionButtonTintList(...); + *** getCardViewBackgroundColor(...); } -keep class org.chromium.chrome.browser.tasks.tab_management.BraveTabUiThemeProvider { *** getTitleTextColor(...); *** getActionButtonTintList(...); + *** getCardViewBackgroundColor(...); } -keep class org.chromium.chrome.browser.autofill.AutofillPopupBridge { diff --git a/android/java/res/values-night/brave_colors.xml b/android/java/res/values-night/brave_colors.xml index 031f42862d1..a798e7b0d0a 100644 --- a/android/java/res/values-night/brave_colors.xml +++ b/android/java/res/values-night/brave_colors.xml @@ -13,6 +13,9 @@ @color/default_text_color_on_accent1_light @color/toolbar_background_primary + + @color/baseline_primary_200 + #F0F2FF #1E2029 #478AFF diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml index 9fd24389feb..f82b5cd5424 100644 --- a/android/java/res/values/brave_colors.xml +++ b/android/java/res/values/brave_colors.xml @@ -56,6 +56,7 @@ #fb542b + @color/baseline_primary_200 diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 40c1d1d9337..625d013c4fd 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -355,6 +355,9 @@ public class BytecodeTest { Assert.assertTrue( methodExists("org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider", "getActionButtonTintList", false, null)); + Assert.assertTrue( + methodExists("org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider", + "getCardViewBackgroundColor", false, null)); Assert.assertTrue(methodExists( "org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider", "getTitleTextColor", false, null)); @@ -363,6 +366,9 @@ public class BytecodeTest { "getActionButtonTintList", false, null)); Assert.assertTrue(methodExists("org/chromium/chrome/browser/ntp/NewTabPage", "updateSearchProviderHasLogo", false, null)); + Assert.assertTrue(methodExists( + "org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider", + "getCardViewBackgroundColor", false, null)); } @Test diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTabUiThemeProviderClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTabUiThemeProviderClassAdapter.java index 9c6082e527f..e166724b92d 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveTabUiThemeProviderClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveTabUiThemeProviderClassAdapter.java @@ -21,5 +21,8 @@ public class BraveTabUiThemeProviderClassAdapter extends BraveClassVisitor { changeMethodOwner(sTabUiThemeProviderClassName, "getActionButtonTintList", sBraveTabUiThemeProviderClassName); + + changeMethodOwner(sTabUiThemeProviderClassName, "getCardViewBackgroundColor", + sBraveTabUiThemeProviderClassName); } }