Merge branch '1296-accent' into 'master'

0031-Remove-webGL-site-setting.patch

0032-Browser-Remove-broken-link-about-entries.patch

0033-Revert-Remove-navigator.connection-info.patch

0034-Change-accent-to-match-our-palette.patch

From 88056c5d575eb5a8e467fc17c84f15686902aa8e Mon Sep 17 00:00:00 2001

From: Nishith Khanna <nishithkhanna@e.email>

Date: Wed, 26 Jul 2023 13:05:33 +0530

Subject: [PATCH] Change accent to match our palette

---

 .../browser/tasks/tab_management/TabUiThemeProvider.java  | 7 +++----

 .../chromium/chrome/browser/omnibox/UrlBarViewBinder.java | 2 +-

 .../browser/omnibox/styles/OmniboxResourceProvider.java   | 2 +-

 .../android/java/res/color/text_highlight_color.xml       | 2 +-

 .../styles/android/java/res/values-night/styles.xml       | 2 +-

 .../android/java/res/values/semantic_colors_dynamic.xml   | 6 +++---

 .../browser_ui/styles/android/java/res/values/themes.xml  | 8 ++++----

 .../browser_ui/theme/android/java/res/values/themes.xml   | 4 ++--

 8 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java

index c6696518df68a..b076ab98c1615 100644

--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java

+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java

@@ -47,7 +47,7 @@ public class TabUiThemeProvider {

             float tabElevation = context.getResources().getDimension(R.dimen.tab_bg_elevation);

             @ColorInt

             int colorInt = isSelected

-                    ? MaterialColors.getColor(context, org.chromium.chrome.R.attr.colorPrimary, TAG)

+                    ? context.getColor(R.color.default_control_color_active_baseline)

                     : new ElevationOverlayProvider(context)

                               .compositeOverlayWithThemeSurfaceColorIfNeeded(tabElevation);

             return colorInt;

@@ -151,7 +151,7 @@ public class TabUiThemeProvider {

                     context, R.color.incognito_tab_bg_selected_color);

         }

         return ColorStateList.valueOf(

-                MaterialColors.getColor(context, org.chromium.chrome.R.attr.colorPrimary, TAG));

+                context.getColor(R.color.default_control_color_active_baseline));

     }

     /**

@@ -291,8 +291,7 @@ public class TabUiThemeProvider {

         } else {

             if (isSelected) {

                 @ColorInt

-                int baseColor = MaterialColors.getColor(

-                        context, org.chromium.chrome.R.attr.colorPrimary, TAG);

+                int baseColor = context.getColor(R.color.default_control_color_active_baseline);

                 int alpha = context.getResources().getInteger(

                         R.integer.tab_grid_hovered_card_background_selected_color_alpha);

                 return ColorStateList.valueOf(

diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java

index 3b07ccf977b4e..e5ff696945f73 100644

--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java

+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java

@@ -140,7 +140,7 @@ class UrlBarViewBinder {

             final int color = useIncognitoColors

                     ? view.getContext().getColor(R.color.default_control_color_active_dark)

-                    : MaterialColors.getColor(view, R.attr.colorPrimary);

+                    : view.getContext().getColor(R.color.default_control_color_active_baseline);

             textCursor.mutate().setTint(color);

             textSelectHandle.mutate().setTint(color);

             textSelectHandleLeft.mutate().setTint(color);

diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java

index e145120930b2e..9eed46a6d438d 100644

--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java

+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java

@@ -254,7 +254,7 @@ public class OmniboxResourceProvider {

         if (brandedColorScheme == BrandedColorScheme.INCOGNITO) {

             return context.getColor(R.color.locationbar_status_preview_color_incognito);

         }

-        return MaterialColors.getColor(context, R.attr.colorPrimary, TAG);

+        return context.getColor(R.color.default_control_color_active_baseline);

     }

     /**

diff --git a/components/browser_ui/styles/android/java/res/color/text_highlight_color.xml b/components/browser_ui/styles/android/java/res/color/text_highlight_color.xml

index 141d168fd81fd..48dbfd3c1306b 100644

--- a/components/browser_ui/styles/android/java/res/color/text_highlight_color.xml

+++ b/components/browser_ui/styles/android/java/res/color/text_highlight_color.xml

@@ -6,5 +6,5 @@ found in the LICENSE file.

 -->

 <selector xmlns:android="http://schemas.android.com/apk/res/android">

-    <item android:alpha="@dimen/text_highlight_alpha" android:color="?attr/colorPrimary" />

+    <item android:alpha="@dimen/text_highlight_alpha" android:color="@color/default_control_color_active_baseline" />

 </selector>

diff --git a/components/browser_ui/styles/android/java/res/values-night/styles.xml b/components/browser_ui/styles/android/java/res/values-night/styles.xml

index b975b15289b73..05978ff530d48 100644

--- a/components/browser_ui/styles/android/java/res/values-night/styles.xml

+++ b/components/browser_ui/styles/android/java/res/values-night/styles.xml

@@ -20,7 +20,7 @@ found in the LICENSE file.

         <item name="colorSurface">@color/baseline_neutral_900</item>

         <item name="colorSurfaceVariant">@color/baseline_neutral_variant_700</item>

-        <item name="elevationOverlayAccentColor">?attr/colorPrimary</item>

+        <item name="elevationOverlayAccentColor">@color/default_control_color_active_baseline</item>

         <item name="elevationOverlayColor">@color/baseline_neutral_200</item>

         <item name="elevationOverlayEnabled">true</item>

     </style>

diff --git a/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml b/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml

index 32522dda0a827..8ad5d08650740 100644

--- a/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml

+++ b/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml

@@ -8,17 +8,17 @@ found in the LICENSE file.

     <macro name="default_bg_color">?attr/colorSurface</macro>

     <macro name="default_bg_color_elev_0">?attr/colorSurface</macro>

-    <macro name="default_control_color_active">?attr/colorPrimary</macro>

+    <macro name="default_control_color_active">@color/default_control_color_active_baseline</macro>

     <macro name="default_control_color_normal">?attr/colorOnSurfaceVariant</macro>

     <macro name="default_icon_color">?attr/colorOnSurface</macro>

-    <macro name="default_icon_color_accent1">?attr/colorPrimary</macro>

+    <macro name="default_icon_color_accent1">@color/default_control_color_active_baseline</macro>

     <macro name="default_icon_color_inverse">?attr/colorOnSurfaceInverse</macro>

     <macro name="default_icon_color_on_accent1">?attr/colorOnPrimary</macro>

     <macro name="default_icon_color_secondary">?attr/colorOnSurfaceVariant</macro>

     <macro name="default_text_color">?attr/colorOnSurface</macro>

-    <macro name="default_text_color_accent1">?attr/colorPrimary</macro>

+    <macro name="default_text_color_accent1">@color/default_control_color_active_baseline</macro>

     <macro name="default_text_color_on_accent1">?attr/colorOnPrimary</macro>

     <macro name="default_text_color_on_accent2_container">?attr/colorOnSecondaryContainer</macro>

     <macro name="default_text_color_secondary" tools:ignore="UnusedResources">?attr/colorOnSurfaceVariant</macro>

diff --git a/components/browser_ui/styles/android/java/res/values/themes.xml b/components/browser_ui/styles/android/java/res/values/themes.xml

index 9b6207e34c08e..57052571cd693 100644

--- a/components/browser_ui/styles/android/java/res/values/themes.xml

+++ b/components/browser_ui/styles/android/java/res/values/themes.xml

@@ -37,7 +37,7 @@ found in the LICENSE file.

         <item name="colorSurface">@color/baseline_neutral_0</item>

         <item name="colorSurfaceVariant">@color/baseline_neutral_variant_100</item>

-        <item name="elevationOverlayAccentColor">?attr/colorPrimary</item>

+        <item name="elevationOverlayAccentColor">@color/default_control_color_active_baseline</item>

         <item name="elevationOverlayColor">@color/baseline_neutral_600</item>

         <item name="elevationOverlayEnabled">true</item>

     </style>

@@ -54,7 +54,7 @@ found in the LICENSE file.

         <item name="elevationOverlayEnabled">false</item>

     </style>

     <style name="ThemeOverlay.BrowserUI.DynamicColors" parent="ThemeOverlay.Material3.DynamicColors.DayNight">

-        <item name="elevationOverlayColor">?attr/colorPrimary</item>

+        <item name="elevationOverlayColor">@color/default_control_color_active_baseline</item>

         <item name="elevationOverlayAccentColor">@android:color/transparent</item>

     </style>

     <!-- TODO(skym): Move this into ThemeOverlay.BrowserUI.DynamicColors instead. -->

@@ -73,7 +73,7 @@ found in the LICENSE file.

         <item name="globalFilledButtonTextColor">@color/default_text_color_on_accent1_list</item>

         <item name="globalTextButtonTextColor">@color/default_text_color_accent1_tint_list</item>

         <item name="globalOutlinedButtonBorderColor">@macro/divider_line_bg_color</item>

-        <item name="globalLinkTextColor">?attr/colorPrimary</item>

-        <item name="globalClickableSpanColor">?attr/colorPrimary</item>

+        <item name="globalLinkTextColor">@color/default_control_color_active_baseline</item>

+        <item name="globalClickableSpanColor">@color/default_control_color_active_baseline</item>

     </style>

 </resources>

diff --git a/components/browser_ui/theme/android/java/res/values/themes.xml b/components/browser_ui/theme/android/java/res/values/themes.xml

index 5e3b31af4a4d0..c4f2badc8ecb7 100644

--- a/components/browser_ui/theme/android/java/res/values/themes.xml

+++ b/components/browser_ui/theme/android/java/res/values/themes.xml

@@ -45,7 +45,7 @@ found in the LICENSE file.

         <!-- Elevation overlays -->

         <item name="elevationOverlayEnabled">true</item>

         <item name="elevationOverlayColor">@color/baseline_neutral_600</item>

-        <item name="elevationOverlayAccentColor">?attr/colorPrimary</item>

+        <item name="elevationOverlayAccentColor">@color/default_control_color_active_baseline</item>

         <!-- Baseline values for the theme attributes in ThemeOverlay.DynamicButtons, used to

              prevent crashes when the DynamicColorCTAAndroid flag is disabled. -->

@@ -134,7 +134,7 @@ found in the LICENSE file.

         <!-- Elevation overlays -->

         <item name="elevationOverlayEnabled">true</item>

         <item name="elevationOverlayColor">@color/baseline_neutral_600</item>

-        <item name="elevationOverlayAccentColor">?attr/colorPrimary</item>

+        <item name="elevationOverlayAccentColor">@color/default_control_color_active_baseline</item>

         <!-- Baseline values for the theme attributes in ThemeOverlay.DynamicButtons, used to

              prevent crashes when the DynamicColorCTAAndroid flag is disabled. -->

-- 

2.41.0