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

diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 617feb3..8a6b697 100644 (file)
--- 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 8deae1c..2227b88 100644 (file)
--- 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 ff040ee..f60b366 100644 (file)
--- 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 a8ae506..0975b4e 100644 (file)
--- 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 41ace18..92edb17 100644 (file)
--- 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>