From 20e09e05cc6b86676de16cabe383ad82892a8102 Mon Sep 17 00:00:00 2001
From: Salvador Martinez <dehboxturtle@google.com>
Date: Wed, 27 Mar 2019 18:50:16 -0700
Subject: [PATCH] Change master switch background and icon color

This CL updates the master switch background color and also
reverts the color of the icons on the left hand side from color
accent back to the default.

Test: visual inspection
Bug: 128769294
Change-Id: Ie02f5049ad628c8564638264e690825f404ee3d9
---
 res/values-night/colors.xml           | 1 -
 res/values-night/themes.xml           | 4 +---
 res/values/colors.xml                 | 1 -
 res/values/themes.xml                 | 2 +-
 tests/robotests/res/values/themes.xml | 2 +-
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 617feb31ec1..8a6b697c1b8 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -16,7 +16,6 @@
 
 <resources>
   <color name="switchbar_text_color">@android:color/black</color>
-  <color name="switch_bar_background">#dadce0</color>
   <color name="switchbar_switch_track_tint">#82000000</color>
   <color name="switchbar_switch_thumb_tint">@android:color/black</color>
   <color name="homepage_accessibility_background">#783BE5</color>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index 8deae1cb359..2227b889bb3 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -29,9 +29,7 @@
         <item name="android:colorControlNormal">?android:attr/colorAccent</item>
     </style>
 
-    <style name="Theme.SubSettings" parent="Theme.SubSettings.Base">
-        <item name="android:colorControlNormal">?android:attr/colorAccent</item>
-    </style>
+    <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
 
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@*android:color/accent_device_default_dark</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ff040ee2df4..f60b366a801 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -56,7 +56,6 @@
     <color name="material_blue_700">#3367D6</color>
     <color name="material_grey_100">#f5f5f5</color>
     <color name="material_grey_200">#ffffff</color>
-    <color name="switch_bar_background">#757575</color>
 
     <color name="message_text_incoming">#ffffffff</color>
     <color name="message_text_outgoing">#ff323232</color>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a8ae50638ee..0975b4e8637 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -94,7 +94,7 @@
     <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar">
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
-        <item name="switchBarBackgroundColor">@color/switch_bar_background</item>
+        <item name="switchBarBackgroundColor">?android:attr/textColorSecondary</item>
         <item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
         <item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>
     </style>
diff --git a/tests/robotests/res/values/themes.xml b/tests/robotests/res/values/themes.xml
index 41ace18a15e..92edb17b503 100644
--- a/tests/robotests/res/values/themes.xml
+++ b/tests/robotests/res/values/themes.xml
@@ -23,7 +23,7 @@
         <item name="android:textColorPrimary">@android:color/white</item>
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
-        <item name="switchBarBackgroundColor">@color/switch_bar_background</item>
+        <item name="switchBarBackgroundColor">?android:attr/textColorSecondary</item>
         <item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
         <item name="switchBarRestrictionIcon">@drawable/ic_help</item>
     </style>