Rebase conflicting /e/ patches

From 1eee5ef85d303fd2155d9d64b5c7d4466cc7ac7f Mon Sep 17 00:00:00 2001

From fe84005c72dc6e5e212f08f7c1530301fa8d70d2 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Tue, 5 Nov 2024 10:08:21 +0530

Subject: Browser: Enable external intent requests

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

---

 .../java/res/xml/privacy_preferences.xml      |  3 +-

 .../customtabs/CustomTabDelegateFactory.java  |  4 +--

         android:key="security_section"

       android:title="@string/security_section_title" />

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java

index a2617bb046602..2c2f5ce7787c5 100644

index c74f651e1e883..6c4b4417c3e05 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java

@@ -16,6 +16,7 @@ import androidx.annotation.Nullable;

 import org.chromium.base.CallbackUtils;

+import org.chromium.base.ContextUtils;

 import org.chromium.base.metrics.RecordHistogram;

 import org.chromium.base.supplier.Supplier;

 import org.chromium.blink.mojom.DisplayMode;

@@ -36,7 +37,6 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;

 import org.chromium.blink.mojom.DisplayMode.EnumType;

@@ -35,7 +36,6 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;

 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;

 import org.chromium.chrome.browser.flags.ActivityType;

 import org.chromium.chrome.browser.flags.ChromeFeatureList;

 import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;

 import org.chromium.chrome.browser.fullscreen.FullscreenManager;

 import org.chromium.chrome.browser.init.ChromeActivityNativeDelegate;

@@ -129,7 +129,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {

@@ -153,7 +153,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {

         @Override

         public boolean shouldDisableAllExternalIntents() {

                     && ChromeFeatureList.sCctAuthTabDisableAllExternalIntents.isEnabled();

         }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java

index 0aaec7e505a12..ae6b9ea74056a 100644

index c81e823af5f8c..c1ebb5a1b1fe3 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java

@@ -26,7 +26,6 @@ import org.chromium.base.supplier.Supplier;

@@ -25,7 +25,6 @@ import org.chromium.base.PackageManagerUtils;

 import org.chromium.build.annotations.NullMarked;

 import org.chromium.build.annotations.Nullable;

 import org.chromium.chrome.browser.ChromeTabbedActivity2;

 import org.chromium.chrome.browser.IntentHandler;

 import org.chromium.chrome.browser.browserservices.intents.WebappConstants;

 import org.chromium.chrome.browser.document.ChromeLauncherActivity;

@@ -56,6 +55,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat

@@ -57,6 +56,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat

     private boolean mIsTabDestroyed;

     public ExternalNavigationDelegateImpl(Tab tab) {

         mTab = tab;

         mTabModelSelectorSupplier = TabModelSelectorSupplier.from(tab.getWindowAndroid());

@@ -118,8 +119,7 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat

@@ -120,8 +121,7 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat

     @Override

     public boolean shouldDisableExternalIntentRequestsForUrl(GURL url) {

-        if ("tel".equals(url.getScheme())) return false;

     public boolean shouldDisableExternalIntentRequestsForUrl(

             ExternalNavigationParams params, Intent intent) {

-        if ("tel".equals(params.getUrl().getScheme())) return false;

-        return !sAllowExternalIntentRequests.getInstance().isEnabled();

+        return !ContextUtils.getAppSharedPreferences().getBoolean(PREF_OPEN_EXTERNAL_INTENT, true);

     }

     @Override

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

index 55f1756add01d..dc3957bfe4251 100644

index c0f9c1faf0f9d..c3dbed7a60930 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

@@ -170,6 +170,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -171,6 +171,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

     private ChromeSwitchPreference allowCustomTabIntentsPref;

     private ChromeSwitchPreference openExternalLinksPref;

-                "AllowExternalIntentRequests",

-                base::FEATURE_DISABLED_BY_DEFAULT);

-- 

2.50.1

2.34.1

From e0af4258d76b6aaeb04cb78cf74bd9a4be955239 Mon Sep 17 00:00:00 2001

From a8e520b306d501118edee34d30e0b8fe461271fd Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Thu, 11 Jul 2024 11:11:15 +0530

Subject: Browser: Hide settings when parental control is active

Co-authored-by: Nishith Khanna <nishithkhanna@e.email>

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

---

 .../chrome/browser/app/ChromeActivity.java    |  3 +-

 .../browser/app/flags/ChromeCachedFlags.java  | 29 +++++++++++++++++++

 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

index c290674daf8d9..ba58b517ba730 100644

index 4e12aa17b33ea..696ddca4b6058 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -71,6 +71,7 @@ import org.chromium.chrome.browser.WarmupManager;

@@ -74,6 +74,7 @@ import org.chromium.chrome.browser.WarmupManager;

 import org.chromium.chrome.browser.ai.AiAssistantService;

 import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;

 import org.chromium.chrome.browser.app.download.DownloadMessageUiDelegate;

 import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics;

 import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFactory;

 import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController;

@@ -2443,7 +2444,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -2479,7 +2480,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         @BrowserProfileType

         int type = Profile.getBrowserProfileTypeFromProfile(getCurrentTabModel().getProfile());

                     SettingsNavigationFactory.createSettingsNavigation();

             settingsNavigation.startSettings(this);

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java

index caf39dffd5b90..7b5f2a09a5b8a 100644

index b05d8a5fa13e1..b50ab894dfd2f 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java

@@ -28,6 +28,7 @@ import org.chromium.components.omnibox.OmniboxFeatures;

 import org.chromium.components.permissions.PermissionsAndroidFeatureList;

@@ -29,6 +29,7 @@ import org.chromium.components.permissions.PermissionsAndroidFeatureList;

 import org.chromium.components.signin.SigninFeatureMap;

 import org.chromium.ui.base.UiAndroidFeatureList;

+import java.lang.reflect.Method;

 import java.util.ArrayList;

 import java.util.List;

 import java.util.Set;

@@ -187,4 +188,32 @@ public class ChromeCachedFlags {

@@ -189,4 +190,32 @@ public class ChromeCachedFlags {

         return cachedFlag.isEnabled();

     }

+    }

 }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

index 55c76ff1bf954..1af9b5372b5be 100644

index a1e7a22af6039..4802fe88a55db 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

@@ -22,6 +22,7 @@ import androidx.lifecycle.Lifecycle;

@@ -21,6 +21,7 @@ import androidx.annotation.VisibleForTesting;

 import androidx.lifecycle.Lifecycle;

 import androidx.preference.Preference;

 import org.chromium.base.BuildInfo;

+import org.chromium.chrome.browser.app.flags.ChromeCachedFlags;

 import org.chromium.base.ContextUtils;

 import org.chromium.base.DeviceInfo;

 import org.chromium.base.shared_preferences.SharedPreferencesManager;

@@ -178,6 +179,9 @@ public class MainSettings extends ChromeBaseSettingsFragment

@@ -183,6 +184,9 @@ public class MainSettings extends ChromeBaseSettingsFragment

     @Override

     public void onStart() {

         SyncService syncService = SyncServiceFactory.getForProfile(getProfile());

         if (syncService != null) {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

index 47b6bcd9108a8..49662ca7f069f 100644

index 4a2d47f15d327..ccd2e09226995 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

@@ -32,6 +32,7 @@ import org.chromium.chrome.browser.ActivityTabProvider;

 import org.chromium.chrome.browser.bookmarks.BookmarkModel;

 import org.chromium.chrome.browser.device.DeviceConditions;

 import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils;

@@ -819,12 +820,16 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

@@ -831,12 +832,16 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm

     }

     private MVCListAdapter.ListItem buildSettingsItem() {

     private boolean shouldShowListenToFeedItem(@Nullable Tab currentTab) {

-- 

2.50.1

2.34.1

From 0ba3aef23b4ff4256f76bc691cbdcdb18e8265c9 Mon Sep 17 00:00:00 2001

From 964b6a2e6fab75e0f95c967cfdbad80efa4d81e2 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Thu, 18 Mar 2021 13:42:44 +0100

Subject: Browser: Modify default search engines

Co-authored-by: althafvly <althafvly@gmail.com>

Co-authored-by: Nishith Khanna <nishithkhanna@e.email>

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

---

 .../locale/locale_template_url_loader.cc      | 42 ++-----------------

 .../locale/locale_template_url_loader.h       |  1 -

     }

 }

diff --git a/components/regional_capabilities/regional_capabilities_service.cc b/components/regional_capabilities/regional_capabilities_service.cc

index 1f0b39cd2c4f1..e583d18bd225f 100644

index 4f95ae3d0471c..d40f93b79ad6e 100644

--- a/components/regional_capabilities/regional_capabilities_service.cc

+++ b/components/regional_capabilities/regional_capabilities_service.cc

@@ -236,6 +236,10 @@ RegionalCapabilitiesService::~RegionalCapabilitiesService() {

@@ -270,6 +270,10 @@ RegionalCapabilitiesService::~RegionalCapabilitiesService() {

 std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>

 RegionalCapabilitiesService::GetRegionalPrepopulatedEngines() {

     if (SameDomain(url, GURL(engine->search_url))) {

       return engine->type;

diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc

index bb24aca0e6f82..e57e6b90f6f34 100644

index fe4af9b0ec735..3e96bf696425e 100644

--- a/components/search_engines/template_url_prepopulate_data.cc

+++ b/components/search_engines/template_url_prepopulate_data.cc

@@ -146,7 +146,8 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(

   t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));

   return t_urls;

 }

@@ -178,7 +179,8 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(

@@ -177,7 +178,8 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(

                             country_id, prefs,

           regional_capabilities::SearchEngineListType::kTopFive),

                             regional_capabilities::SearchEngineListType::kTopN),

                         &PrepopulatedEngineToTemplateURLData);

-  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(googleen));

+  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(murenasearch));

   t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));

   return t_urls;

 }

@@ -253,7 +255,7 @@ std::unique_ptr<TemplateURLData> GetPrepopulatedFallbackSearch(

@@ -252,7 +254,7 @@ std::unique_ptr<TemplateURLData> GetPrepopulatedFallbackSearch(

     std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>

         regional_prepopulated_engines) {

   return FindPrepopulatedEngineInternal(prefs, regional_prepopulated_engines,

 }

-- 

2.50.1

2.34.1

From 56f7dfdbd082e4ab6bd32c87fe8fa8911bae3905 Mon Sep 17 00:00:00 2001

From eeaa91245f250a9fd3b63ba4bef6f53ff1e8df34 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Tue, 11 May 2021 14:22:00 +0200

Subject: Browser: Redirect users to e foundation docs

Signed-off-by: Aayush Gupta <theimpulson@e.email>

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

---

 .../chrome/browser/feedback/HelpAndFeedbackLauncherImpl.java    | 2 +-

 .../browser/feedback/HelpAndFeedbackLauncherDelegate.java       | 2 +-

     private static @Nullable ProfileKeyedMap<HelpAndFeedbackLauncher> sProfileToLauncherMap;

     private final HelpAndFeedbackLauncherDelegate mDelegate;

diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherDelegate.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherDelegate.java

index b900240bfa2f2..53b13800197a5 100644

index 13793349cb392..d7e74636f0464 100644

--- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherDelegate.java

+++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherDelegate.java

@@ -15,7 +15,7 @@ import org.chromium.build.annotations.NullMarked;

 /** Delegate that handles the display of the HelpAndFeedback flows. */

 @NullMarked

 public interface HelpAndFeedbackLauncherDelegate {

-    static final String FALLBACK_SUPPORT_URL = "https://support.google.com/chrome/topic/6069782";

+    static final String FALLBACK_SUPPORT_URL = "https://doc.e.foundation/how-tos/";

-    String FALLBACK_SUPPORT_URL = "https://support.google.com/chrome/topic/6069782";

+    String FALLBACK_SUPPORT_URL = "https://doc.e.foundation/how-tos/";

     /**

      * Starts an activity showing a help page for the specified context ID.

-- 

2.50.1

2.34.1

From 9a988ba8dd1ceadb670d3fd09dd222aa15369e41 Mon Sep 17 00:00:00 2001

From 13765bd3bad7d2030d439f4672000dc38ebcfb8f 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>

---

 .../keyboard_accessory_sheet_tab_option_toggle.xml       | 2 +-

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

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

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

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

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

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

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

 24 files changed, 67 insertions(+), 25 deletions(-)

 23 files changed, 66 insertions(+), 24 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

         android:layout_marginStart="16dp"

         android:layout_width="48dp"

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 0e60d9b20e26c..4b87c7e4098f5 100644

index beb8813e9d5ce..0d0a80f44c29f 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

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

                 int alpha =

                         context.getResources()

                                 .getInteger(

@@ -171,8 +172,8 @@ public class TabUiThemeProvider {

@@ -175,8 +176,8 @@ public class TabUiThemeProvider {

                             ? R.color.incognito_tab_grid_dialog_ungroup_bar_text_hovered_color

                             : R.color.incognito_tab_grid_dialog_ungroup_bar_text_color);

         } else {

           android:id="@+id/price_tracking_switch"

           app:layout_constraintTop_toTopOf="parent"

           app:layout_constraintBottom_toBottomOf="parent"

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

index b64746de1b4d3..4b9e14c19fd2e 100644

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

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

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

             "@string/accessibility_incognito_3pc_settings"

         app:tint="@color/default_icon_color_light" />

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

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

         android:id="@+id/cookie_controls_card_toggle"

         android:layout_width="wrap_content"

         android:layout_height="wrap_content"

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

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

-    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 2ef882beb0af9..79f862cc949a1 100644

index 43bfc9775d6b7..228c81c8a4892 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

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

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

         final int color =

                 useIncognitoColors

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

-    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 0eebc801da340..003817b0dff23 100644

index cf0bf0eee6dee..ead67aa90c23c 100644

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

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

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

+    <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 8cfae64f0119c..7985902587a2a 100644

index 252315af398c1..07b06756ab687 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

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

     <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 516d07c84d033..5b8e12e1996d0 100644

index d7843461cbdb8..5ceb6dac1ee92 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.

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

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

     </style>

     <style name="Widget.BrowserUI.Switch.Incognito">

         <item name="materialThemeOverlay">@style/ThemeOverlay.BrowserUI.Switch.Incognito</item>

     <!-- TextInputLayout style -->

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

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 e35c47cafc081..742752e51f527 100644

index 0cef24741e890..1ba5943bf8716 100644

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

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

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

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

     </style>

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

         <!-- 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/templates/res/values/themes.xml b/components/browser_ui/theme/android/templates/res/values/themes.xml

index b84a8887aca9c..60404ab759509 100644

index 358c08d6991f9..f315a082877fc 100644

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

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

@@ -61,7 +61,7 @@ Note: This is a jinja2 template, processed at build time into the final resource

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

 </resources>

-- 

2.50.1

2.34.1