commit 3f9b24e5317398b2bfecb9af8543f03d972fae4c
author Adam Powell <adamp@google.com> Fri Aug 10 13:36:58 2012 -0700
committer Adam Powell <adamp@google.com> Fri Aug 10 13:38:43 2012 -0700
tree a963e1d37e927f7352815e21035d24593761ee3f
parent 9252dbd314bbce75f1e57330c5a911c9f6428cf5

Fix some Holo text color bugs

Fix Switch text color in Holo Light to contrast better - always light
text against the dark switch thumb.

Fix a bug where TextAppearance.Holo.Small.Inverse was using
?textColorPrimaryInverse instead of ?textColorSecondaryInverse.
("Small" TextAppearance always uses the secondary color.)

Bug 6967184

Change-Id: I039bf089d4c7aa257ec4f600df6c0d2066164194

core/res/res/values/styles.xml

diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index a6236f7..74e2425 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1259,7 +1259,7 @@
     </style>
 
     <style name="TextAppearance.Holo.Small.Inverse">
-        <item name="android:textColor">?textColorPrimaryInverse</item>
+        <item name="android:textColor">?textColorSecondaryInverse</item>
         <item name="android:textColorHint">?textColorHintInverse</item>
         <item name="android:textColorHighlight">?textColorHighlightInverse</item>
         <item name="android:textColorLink">?textColorLinkInverse</item>
@@ -1392,6 +1392,13 @@
     </style>
 
     <style name="TextAppearance.Holo.Widget.Switch" parent="TextAppearance.Holo.Small">
+        <!-- Switch thumb asset presents a dark background. -->
+        <item name="android:textColor">@android:color/secondary_text_holo_dark</item>
+    </style>
+
+    <style name="TextAppearance.Holo.Light.Widget.Switch" parent="TextAppearance.Holo.Small">
+        <!-- Switch thumb asset presents a dark background. -->
+        <item name="android:textColor">@android:color/primary_text_holo_dark</item>
     </style>
 
     <style name="TextAppearance.Holo.WindowTitle">
@@ -2317,7 +2324,7 @@
     <style name="Widget.Holo.Light.CompoundButton.Switch" parent="Widget.CompoundButton.Switch">
         <item name="android:track">@android:drawable/switch_track_holo_light</item>
         <item name="android:thumb">@android:drawable/switch_inner_holo_light</item>
-        <item name="android:switchTextAppearance">@android:style/TextAppearance.Holo.Widget.Switch</item>
+        <item name="android:switchTextAppearance">@android:style/TextAppearance.Holo.Light.Widget.Switch</item>
         <item name="android:textOn">@android:string/capital_on</item>
         <item name="android:textOff">@android:string/capital_off</item>
         <item name="android:thumbTextPadding">12dip</item>