Update switch to new material3 one added in elib

From 9396a054ce880829ea168bd64d3068499489369c Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Wed, 7 Aug 2024 14:05:16 +0530

Subject: Browser: Use correct switch scale

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 components/browser_ui/widget/android/java/res/values/dimens.xml | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml

index 3639563a7bf6f..47e11d2b16b08 100644

--- a/components/browser_ui/widget/android/java/res/values/dimens.xml

+++ b/components/browser_ui/widget/android/java/res/values/dimens.xml

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

     <!-- Preference switch -->

     <!-- Work around to adopt the material switch . See crbug/1248590. -->

-    <item type="fraction" name="material_switch_scale_fraction">0.8</item>

+    <item type="fraction" name="material_switch_scale_fraction">1</item>

     <!-- Min height required to satisfy the min touch target size-->

     <dimen name="switch_pre_scale_min_height">60dp</dimen>

     <dimen name="switch_with_text_min_height">@dimen/min_touch_target_size</dimen>

-- 

2.53.0

From 45cadfed3bbc96afa10df1c7335f20873aff49f6 Mon Sep 17 00:00:00 2001

From 8e06a31a4e0c5042cd205f64d6fac26a5347e64f Mon Sep 17 00:00:00 2001

From: Nishith Khanna <nishithkhanna@e.email>

Date: Tue, 20 Feb 2024 20:35:25 +0530

Subject: Change accent and switch to match our palette

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

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

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

 .../keyboard_accessory_sheet_tab_option_toggle.xml       | 2 +-

 .../android/java/res/layout/readaloud_toggle_switch.xml  | 2 +-

 .../tasks/tab_management/TabUiThemeProvider.java      |  9 +++++----

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

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

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

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

 .../account_picker_bottom_sheet_new_account_row.xml   |  2 +-

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

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

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

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

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

 .../java/res/drawable/e_switch_track_decoration.xml   | 11 +++++++++++

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

 .../styles/android/java/res/values/styles.xml         |  9 ++++++---

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

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

 .../widget/android/java/res/layout/preference_switch.xml | 2 +-

 .../android/res/layout/infobar_control_toggle.xml        | 2 +-

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

 20 files changed, 63 insertions(+), 21 deletions(-)

 17 files changed, 73 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

 create mode 100644 components/browser_ui/styles/android/java/res/drawable/e_switch_track_decoration.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 c41606b118dcc..c5a8859a2334b 100644

         }

     }

diff --git a/chrome/android/java/res/layout/improved_bookmark_save_flow.xml b/chrome/android/java/res/layout/improved_bookmark_save_flow.xml

index 8b83198cdfae7..3c883d9e4aded 100644

--- a/chrome/android/java/res/layout/improved_bookmark_save_flow.xml

+++ b/chrome/android/java/res/layout/improved_bookmark_save_flow.xml

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

             android:textAppearance="@style/TextAppearance.TextSmall.Secondary" />

       </LinearLayout>

-      <com.google.android.material.materialswitch.MaterialSwitch

+      <com.google.android.material.switchmaterial.SwitchMaterial

           android:id="@+id/price_tracking_switch"

           app:layout_constraintTop_toTopOf="parent"

           app:layout_constraintBottom_toBottomOf="parent"

diff --git a/chrome/browser/keyboard_accessory/android/internal/java/res/layout/keyboard_accessory_sheet_tab_option_toggle.xml b/chrome/browser/keyboard_accessory/android/internal/java/res/layout/keyboard_accessory_sheet_tab_option_toggle.xml

index 9d1713c43e8b1..5cefd325aae52 100644

--- a/chrome/browser/keyboard_accessory/android/internal/java/res/layout/keyboard_accessory_sheet_tab_option_toggle.xml

+++ b/chrome/browser/keyboard_accessory/android/internal/java/res/layout/keyboard_accessory_sheet_tab_option_toggle.xml

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

             android:textAppearance="@style/TextAppearance.TextMedium.Secondary" />

     </LinearLayout>

-    <com.google.android.material.materialswitch.MaterialSwitch

+    <com.google.android.material.switchmaterial.SwitchMaterial

         android:id="@+id/option_toggle_switch"

         android:layout_marginStart="16dp"

         android:layout_width="48dp"

diff --git a/chrome/browser/readaloud/android/java/res/layout/readaloud_toggle_switch.xml b/chrome/browser/readaloud/android/java/res/layout/readaloud_toggle_switch.xml

index e980248bb75e2..59bf07c11172c 100644

index e980248bb75e2..86de040784c79 100644

--- a/chrome/browser/readaloud/android/java/res/layout/readaloud_toggle_switch.xml

+++ b/chrome/browser/readaloud/android/java/res/layout/readaloud_toggle_switch.xml

@@ -4,7 +4,7 @@ Copyright 2023 The Chromium Authors

 Use of this source code is governed by a BSD-style license that can be

 found in the LICENSE file.

 -->

-<com.google.android.material.materialswitch.MaterialSwitch

+<com.google.android.material.switchmaterial.SwitchMaterial

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

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

     android:id="@+id/toggle_switch"

     android:layout_width="wrap_content"

     android:layout_height="wrap_content"

-    android:importantForAccessibility="no"/>

\ No newline at end of file

+    android:importantForAccessibility="no"/>

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 b35165820115e..b57823ca8c967 100644

index 4d8897cd59a60..8f0bce5b99872 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

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

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

         final int color =

                 useIncognitoColors

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

         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 45d658674a27f..a24348d99a54b 100644

index a76ea665df1ba..706e30534b8c4 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

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

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

         if (brandedColorScheme == BrandedColorScheme.INCOGNITO) {

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

         }

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

+    app:drawableTint="@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 f23599d2bd41b..32e55f02c5017 100644

index f23599d2bd41b..9704e77f3a321 100644

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

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

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

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

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

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

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

@@ -263,6 +265,9 @@ android_resources("java_resources") {

     "java/res/drawable/secured_by_brand_shield_24.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/drawable/e_switch_track_decoration.xml",

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

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

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

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

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

+</shape>

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

new file mode 100644

index 0000000000000..e136c42acd729

--- /dev/null

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

@@ -0,0 +1,11 @@

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

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

+    android:width="48dp"

+    android:height="20dp"

+    android:viewportWidth="48"

+    android:viewportHeight="20">

+

+    <path

+        android:pathData="M0,0 L0,0" />

+

+</vector>

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 dd9b5c34cabb8..b5b6d9d017ab0 100644

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

     <macro name="default_text_color_on_accent1_container">?attr/colorOnPrimaryContainer</macro>

     <macro name="default_text_color_on_accent2_container">?attr/colorOnSecondaryContainer</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 69bf9aae826c7..5f1799574612a 100644

index c7ad7ea4bbee7..85afadecf6499 100644

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

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

@@ -20,9 +20,13 @@ found in the LICENSE file.

@@ -20,9 +20,12 @@ found in the LICENSE file.

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

     </style>

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

-        <item name="android:scaleX">@fraction/material_switch_scale_fraction</item>

-        <item name="android:scaleY">@fraction/material_switch_scale_fraction</item>

-        <item name="android:minHeight">@dimen/switch_pre_scale_min_height</item>

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

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

         <item name="android:scaleX">@fraction/material_switch_scale_fraction</item>

         <item name="android:scaleY">@fraction/material_switch_scale_fraction</item>

         <item name="android:minHeight">@dimen/switch_pre_scale_min_height</item>

+        <item name="trackTint">@color/e_switch_track_color</item>

+        <item name="thumbTint">@color/e_switch_thumb_color</item>

+        <item name="trackTint">@color/e_switch_track_color</item>

+        <item name="trackDecoration">@drawable/e_switch_track_decoration</item>

+        <item name="thumbIcon">@null</item>

     </style>

     <!-- TextInputLayout style -->

     <style name="Widget.BrowserUI.TextInputLayout" parent="Widget.Design.TextInputLayout">

         <!-- Spinner styles -->

         <item name="spinnerStyle">@style/SpinnerStyle</item>

diff --git a/components/browser_ui/widget/android/java/res/layout/preference_switch.xml b/components/browser_ui/widget/android/java/res/layout/preference_switch.xml

index 38671522f2d23..7d52745ef0f81 100644

--- a/components/browser_ui/widget/android/java/res/layout/preference_switch.xml

+++ b/components/browser_ui/widget/android/java/res/layout/preference_switch.xml

@@ -3,7 +3,7 @@ Copyright 2023 The Chromium Authors

 Use of this source code is governed by a BSD-style license that can be

 found in the LICENSE file.

 -->

-<com.google.android.material.materialswitch.MaterialSwitch

+<com.google.android.material.switchmaterial.SwitchMaterial

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

     style="@style/Widget.BrowserUI.Switch"

     android:id="@+id/switchWidget"

diff --git a/components/infobars/android/res/layout/infobar_control_toggle.xml b/components/infobars/android/res/layout/infobar_control_toggle.xml

index 209d2a1568df5..c615ca94ceffa 100644

--- a/components/infobars/android/res/layout/infobar_control_toggle.xml

+++ b/components/infobars/android/res/layout/infobar_control_toggle.xml

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

         android:gravity="center_vertical"

         android:textAppearance="@style/TextAppearance.TextLarge.Primary" />

-    <com.google.android.material.materialswitch.MaterialSwitch

+    <com.google.android.material.switchmaterial.SwitchMaterial

         android:id="@+id/control_toggle_switch"

         android:layout_width="wrap_content"

         android:layout_height="wrap_content" />

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

index 2d700f659c2dc..949cde86a3244 100644

index 87420ee21b752..af654d94381ae 100644

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

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

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

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

@@ -174,4 +174,8 @@ found in the LICENSE file.

@@ -176,4 +176,8 @@ found in the LICENSE file.

     <color name="material_tertiary_80">@color/baseline_tertiary_80</color>

     <color name="material_tertiary_40">@color/baseline_tertiary_40</color>

Update-app-icon.patch

Update-default-sites.patch

Browser-Hide-settings-when-parental-control-is-active.patch

Browser-Use-correct-switch-scale.patch

Browser-Change-adblock-url-to-ours.patch

Multiple-fingerprinting-mitigations.patch

openH264-enable-ARMARM64-optimizations.patch