Merge branch '5920-browser_ui' into 'master'

0025-Handle-web-search-action-in-browser.patch

0026-Browser-Enable-unified-autoplay-by-default.patch

0027-Browser-Replace-default-tab-favicon.patch

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

From 62b305599db7e1e1327e93bd8468176df478b1de Mon Sep 17 00:00:00 2001

From: Nishith Khanna <nishithkhanna@e.email>

Date: Mon, 16 Jan 2023 16:46:35 +0530

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

---

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

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

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

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

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

 7 files changed, 42 insertions(+), 4 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/components/browser_ui/styles/android/BUILD.gn b/components/browser_ui/styles/android/BUILD.gn

index 96e38ed230699..f512201fe2ff4 100644

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

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

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

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

     "java/res/color/switch_track_tint_incognito_baseline_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",

@@ -214,6 +216,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/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/styles.xml b/components/browser_ui/styles/android/java/res/values/styles.xml

index d0f6bb913458d..9a85a9fa4e262 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/ui/android/java/res/values/color_palette.xml b/ui/android/java/res/values/color_palette.xml

index ac398348031b3..e8ba69e3943f2 100644

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

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

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

     <color name="baseline_error_600">#B3261E</color>

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

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

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

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

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

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

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

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

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

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

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

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

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

     <!-- Only use for older versions of Android mimics UI. -->

     <color name="google_blue_grey_900" tools:ignore="UnusedResources">#263238</color>

     <color name="google_blue_50" tools:ignore="UnusedResources">#E3F2FD</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.39.0