Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cac0306 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Browser: add back e accent colors

parent 41c2b51e

build/patches/0001-Change-accent-and-switch-to-match-our-palette.patch

0 → 100644
+313 −0
Original line number Diff line number Diff line 
From fc75a1a6759df84d1a06b2e1e0d53a3dbf598a9d Mon Sep 17 00:00:00 2001

From: Nishith Khanna <nishithkhanna@e.email>

Date: Tue, 3 Oct 2023 15:00:02 +0530

Subject: [PATCH] Change accent and switch to match our palette



---

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

 .../res/layout/fast_checkout_autofill_profile_item.xml   | 2 +-

 .../java/res/layout/fast_checkout_credit_card_item.xml   | 2 +-

 .../java/res/layout/fast_checkout_footer_item.xml        | 2 +-

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

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

 components/browser_ui/styles/android/BUILD.gn            | 4 ++++

 .../android/java/res/color/e_switch_thumb_color.xml      | 5 +++++

 .../android/java/res/color/e_switch_track_color.xml      | 6 ++++++

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

 .../styles/android/java/res/drawable/e_switch_thumb.xml  | 9 +++++++++

 .../styles/android/java/res/drawable/e_switch_track.xml  | 9 +++++++++

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

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

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

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

 ui/android/java/res/values/color_palette.xml             | 9 +++++++--

 17 files changed, 57 insertions(+), 20 deletions(-)

 create mode 100644 components/browser_ui/styles/android/java/res/color/e_switch_thumb_color.xml

 create mode 100644 components/browser_ui/styles/android/java/res/color/e_switch_track_color.xml

 create mode 100644 components/browser_ui/styles/android/java/res/drawable/e_switch_thumb.xml

 create mode 100644 components/browser_ui/styles/android/java/res/drawable/e_switch_track.xml



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 da146ec203bf3..2454d2e7d2011 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

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

                     : 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;

@@ -165,7 +165,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));

     }

 

     /**

@@ -272,8 +272,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/fast_checkout/internal/java/res/layout/fast_checkout_autofill_profile_item.xml b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_autofill_profile_item.xml

index 3a1e173d18087..7cc57a67dba9f 100644

--- a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_autofill_profile_item.xml

+++ b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_autofill_profile_item.xml

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

         android:layout_marginEnd="@dimen/fast_checkout_detail_sheet_selected_icon_margin_end"

         android:layout_gravity="center_vertical"

         android:contentDescription="@null"

-        app:tint="?attr/colorPrimary"

+        app:tint="@color/default_control_color_active_baseline"

         app:srcCompat="@drawable/ic_check_circle_filled_green_24dp" />

 </LinearLayout>

diff --git a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_credit_card_item.xml b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_credit_card_item.xml

index 4e9e8deb14885..ab4d39f056a55 100644

--- a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_credit_card_item.xml

+++ b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_credit_card_item.xml

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

         android:layout_marginEnd="@dimen/fast_checkout_detail_sheet_selected_icon_margin_end"

         android:layout_gravity="center_vertical"

         android:contentDescription="@null"

-        app:tint="?attr/colorPrimary"

+        app:tint="@color/default_control_color_active_baseline"

         app:srcCompat="@drawable/ic_check_circle_filled_green_24dp" />

 </LinearLayout>

diff --git a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml

index ecc6bc6b9b150..175082479e551 100644

--- a/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml

+++ b/chrome/browser/ui/android/fast_checkout/internal/java/res/layout/fast_checkout_footer_item.xml

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

     android:drawablePadding="@dimen/fast_checkout_detail_sheet_footer_icon_margin_horizontal"

     app:drawableWidth="24dp"

     app:drawableHeight="24dp"

-    app:drawableTint="?attr/colorPrimary" />

+    app:drawableTint="@color/default_control_color_active_baseline" />

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 74427471d6b2f..4cb79b5520efb 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

@@ -153,7 +153,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 745725d72cf2a..177adea993660 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

@@ -322,7 +322,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/BUILD.gn b/components/browser_ui/styles/android/BUILD.gn

index f141c7ee01060..20e8860fe5bcd 100644

--- a/components/browser_ui/styles/android/BUILD.gn

+++ b/components/browser_ui/styles/android/BUILD.gn

@@ -55,6 +55,8 @@ android_resources("java_resources") {

     "java/res/color/switch_track_tint_incognito_baseline_list.xml",

     "java/res/color/text_button_ripple_color_list.xml",

     "java/res/color/text_highlight_color.xml",

+    "java/res/color/e_switch_thumb_color.xml",

+    "java/res/color/e_switch_track_color.xml",

     "java/res/drawable-hdpi/btn_star_filled.png",

     "java/res/drawable-hdpi/ic_chrome.png",

     "java/res/drawable-hdpi/ic_delete_white_24dp.png",

@@ -219,6 +221,8 @@ android_resources("java_resources") {

     "java/res/drawable/ic_web_asset_24dp.xml",

     "java/res/drawable/smartphone_black_24dp.xml",

     "java/res/drawable/toolbar_hairline.xml",

+    "java/res/drawable/e_switch_thumb.xml",

+    "java/res/drawable/e_switch_track.xml",

     "java/res/values-night/colors.xml",

     "java/res/values-night/dimens.xml",

     "java/res/values-night/drawables.xml",

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

new file mode 100644

index 0000000000000..32d4f07465128

--- /dev/null

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

@@ -0,0 +1,5 @@

+<?xml version="1.0" encoding="utf-8"?>

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

+    <item android:state_checked="false" android:color="@color/e_switch_thumb_off" />

+    <item android:color="@color/e_switch_thumb_on" />

+</selector>

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

new file mode 100644

index 0000000000000..89e09db4091c3

--- /dev/null

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

@@ -0,0 +1,6 @@

+<?xml version="1.0" encoding="utf-8"?>

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

+    <item android:state_enabled="false" android:color="@color/e_switch_track_off" android:alpha="0.75" />

+    <item android:state_checked="true" android:color="@color/e_switch_track_on" />

+    <item android:color="@color/e_switch_track_off" />

+</selector>

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/drawable/e_switch_thumb.xml b/components/browser_ui/styles/android/java/res/drawable/e_switch_thumb.xml

new file mode 100644

index 0000000000000..48dfa90e45cf4

--- /dev/null

+++ b/components/browser_ui/styles/android/java/res/drawable/e_switch_thumb.xml

@@ -0,0 +1,9 @@

+<?xml version="1.0" encoding="utf-8"?>

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

+    <item android:top="2dp" android:left="2dp" android:right="2dp" android:bottom="2dp">

+        <shape android:shape="oval" >

+            <size android:height="20dp" android:width="20dp" />

+            <solid android:color="@color/e_switch_thumb_color" />

+        </shape>

+    </item>

+</layer-list>

diff --git a/components/browser_ui/styles/android/java/res/drawable/e_switch_track.xml b/components/browser_ui/styles/android/java/res/drawable/e_switch_track.xml

new file mode 100644

index 0000000000000..f5b1eed6f2e6f

--- /dev/null

+++ b/components/browser_ui/styles/android/java/res/drawable/e_switch_track.xml

@@ -0,0 +1,9 @@

+<?xml version="1.0" encoding="utf-8"?>

+<shape

+    xmlns:android="http://schemas.android.com/apk/res/android"

+    android:shape="rectangle"

+    android:width="36dp"

+    android:height="20dp">

+    <solid android:color="@color/e_switch_track_color" />

+    <corners android:radius="50dp" />

+</shape>

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/styles.xml b/components/browser_ui/styles/android/java/res/values/styles.xml

index be1ae401f8a90..d059872c3d83f 100644

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

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

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

         <item name="android:textAppearance">@style/TextAppearance.TextMedium.Primary</item>

     </style>

     <style name="Widget.BrowserUI.Switch" parent="Widget.MaterialComponents.CompoundButton.Switch">

-        <item name="thumbTint">@color/switch_thumb_tint_list</item>

-        <item name="trackTint">@color/switch_track_tint</item>

+        <item name="android:thumb">@drawable/e_switch_thumb</item>

+        <item name="track">@drawable/e_switch_track</item>

         <item name="trackTintMode">src_in</item>

     </style>

     <style name="Widget.BrowserUI.Switch.Incognito" parent="Widget.MaterialComponents.CompoundButton.Switch">

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 970bcaf596745..7cf37ad0d9af5 100644

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

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

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

     </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>

         <!-- android:textColorHighlight applied by Material3 is too dark, so we override it with our

              own color state list to specify a lower alpha. -->

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 bc4581f9ac3e0..82f20f5c00f37 100644

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

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

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

         <!-- Elevation overlays -->

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

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

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

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

 

         <!-- Current Clank Baseline Surface-N Colors. See https://crbug.com/1410537. -->

         <item name="tileViewIconBackgroundModern">@drawable/oval_surface_1</item>

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

         <!-- Elevation overlays -->

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

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

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

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

 

         <!-- Current Clank Baseline Surface-N Colors. See https://crbug.com/1410537. -->

         <item name="tileViewIconBackgroundModern">@drawable/oval_surface_1</item>

diff --git a/ui/android/java/res/values/color_palette.xml b/ui/android/java/res/values/color_palette.xml

index 91345f7b24a59..20c086496e746 100644

--- a/ui/android/java/res/values/color_palette.xml

+++ b/ui/android/java/res/values/color_palette.xml

@@ -11,11 +11,11 @@ found in the LICENSE file.

     <color name="baseline_primary_100">@android:color/white</color>

     <color name="baseline_primary_95">#ECF3FE</color>

     <color name="baseline_primary_90">#D3E3FD</color>

-    <color name="baseline_primary_80">#A8C7FA</color>

+    <color name="baseline_primary_80">#5DB2FF</color>

     <color name="baseline_primary_80_alpha_10" tools:ignore="UnusedResources">#19A8C7FA</color>

     <color name="baseline_primary_80_alpha_20">#33A8C7FA</color>

     <color name="baseline_primary_80_alpha_50">#80A8C7FA</color>

-    <color name="baseline_primary_40">#0B57D0</color>

+    <color name="baseline_primary_40">#0086FF</color>

     <color name="baseline_primary_40_alpha_6">#0F0B57D0</color>

     <color name="baseline_primary_40_alpha_10">#190B57D0</color>

     <color name="baseline_primary_40_alpha_12">#1F0B57D0</color>

@@ -167,4 +167,9 @@ found in the LICENSE file.

     <color name="material_primary_40">@color/baseline_primary_40</color>

     <color name="material_primary_20">@color/baseline_primary_20</color>

     <color name="material_primary_10">@color/baseline_primary_10</color>

+

+    <color name="e_switch_thumb_on">@android:color/white</color>

+    <color name="e_switch_thumb_off">@android:color/white</color>

+    <color name="e_switch_track_on">#2CC766</color>

+    <color name="e_switch_track_off">#C8CED0</color>

 </resources>

-- 

2.34.1

build/patches_list.txt

+2 −0
Original line number Diff line number Diff line
@@ -51,3 +51,5 @@ 
0001-fixup-Revert-Block-gateway-attacks-via-websockets.patch

0001-Browser-disable-price-shopping-commerce-integration.patch

0002-Automated-domain-substitution.patch



0001-Change-accent-and-switch-to-match-our-palette.patch

build/todo.txt

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# List of removed patches in e

0028-Change-accent-and-switch-according-to-our-palette.patch

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