From a2e7357535dabe66c3f1737d1755aa15a18d6ad7 Mon Sep 17 00:00:00 2001
From: Salvador Martinez <dehboxturtle@google.com>
Date: Thu, 30 May 2019 14:16:52 -0700
Subject: [PATCH] Change switch text color to black in dark mode

It seems that the attribute values that are used to text color
in the switch bar are selectors which leads to problems because
they include an alpha value when the switch is "off". This would
cause the contrast between the text and the background to be too
low for GAR. This CL simply makes it so that in dark mode the text
for the switch bar is just true black since adjusting the
attributes would have wide scale implications for all UIs using
device default themes.

Test: visual inspection
Bug: 132755745
Change-Id: I309db82e9bf020fb654e0b93f6ec84380ae092f7
---
 res/values-night/themes.xml | 4 ++++
 res/values/themes.xml       | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index f47513e7b6f..ec0978b3391 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -31,6 +31,10 @@
 
     <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
 
+    <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base">
+        <item name="android:textColorPrimaryInverse">@android:color/black</item>
+    </style>
+
     <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@*android:color/accent_device_default_dark</item>
         <item name="android:colorBackground">@color/dialog_background</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 3eda34505ca..b96fd868baa 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -90,7 +90,7 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
-    <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
+    <style name="ThemeOverlay.SwitchBar.Settings.Base" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar">
         <item name="android:elevation">1dp</item>
         <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
         <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
@@ -99,6 +99,8 @@
         <item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>
     </style>
 
+    <style name="ThemeOverlay.SwitchBar.Settings" parent="ThemeOverlay.SwitchBar.Settings.Base"/>
+
     <style name="Widget.SwitchBar.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch">
         <item name="android:trackTint">@color/switchbar_switch_track_tint</item>
         <item name="android:thumbTint">@color/switchbar_switch_thumb_tint</item>