summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2017-05-28 11:40:07 -0700
committerLucas Dupin <dupin@google.com>2017-05-28 11:40:07 -0700
commit1c8f56402cf2b14e7975e3e84a7d7168e110fe0b (patch)
tree32698099dec2f79e263a90786ae8a179922dc072
parentcf8f6ee6149f6275d1113afd798efa52faaf621e (diff)
downloadpackages_apps_PhoneCommon-1c8f56402cf2b14e7975e3e84a7d7168e110fe0b.tar.gz
packages_apps_PhoneCommon-1c8f56402cf2b14e7975e3e84a7d7168e110fe0b.tar.bz2
packages_apps_PhoneCommon-1c8f56402cf2b14e7975e3e84a7d7168e110fe0b.zip
Use theme colors instead of color hexes
Bug: 37014702 Test: visual Change-Id: Ifacf27b05e14a4c190b5f7720892452464af6d53
-rw-r--r--res/values/colors.xml1
-rw-r--r--res/values/styles.xml22
2 files changed, 12 insertions, 11 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 65a2ca4..b0f645c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -25,5 +25,6 @@
<color name="dialpad_digits_text_color">#333</color>
<color name="dialpad_separator_line_color">#dadada</color>
<color name="dialpad_icon_tint">#b3b3b3</color>
+ <color name="dialpad_icon_tint_dark">#8a000000</color>
<color name="dialpad_voicemail_tint">#919191</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c087966..3ec34c1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -104,25 +104,25 @@
</style>
<style name="Dialpad_LightTransparent">
- <item name="dialpad_text_color">#414549</item>
- <item name="dialpad_text_color_primary">#414549</item>
- <item name="dialpad_text_color_secondary">#767C80</item>
- <item name="dialpad_icon_tint">?attr/dialpad_text_color_secondary</item>
- <item name="dialpad_voicemail_tint">?attr/dialpad_text_color_secondary</item>
+ <item name="dialpad_text_color">?android:textColorPrimaryInverse</item>
+ <item name="dialpad_text_color_primary">?android:textColorPrimaryInverse</item>
+ <item name="dialpad_text_color_secondary">?android:textColorSecondaryInverse</item>
+ <item name="dialpad_icon_tint">@color/dialpad_icon_tint_dark</item>
+ <item name="dialpad_voicemail_tint">@color/dialpad_icon_tint_dark</item>
<item name="dialpad_background">@android:color/transparent</item>
- <item name="dialpad_separator_color">?attr/dialpad_text_color_secondary</item>
+ <item name="dialpad_separator_color">@color/dialpad_icon_tint_dark</item>
<item name="dialpad_margin_style">@style/DialpadNoSpaceStyle</item>
<item name="dialpad_delete_padding">1dp</item>
</style>
<style name="Dialpad_DarkTransparent">
- <item name="dialpad_text_color">@android:color/white</item>
- <item name="dialpad_text_color_primary">@android:color/white</item>
- <item name="dialpad_text_color_secondary">#ccffffff</item>
+ <item name="dialpad_text_color">?android:textColorPrimary</item>
+ <item name="dialpad_text_color_primary">?android:textColorPrimary</item>
+ <item name="dialpad_text_color_secondary">?android:textColorSecondary</item>
<item name="dialpad_icon_tint">@android:color/white</item>
- <item name="dialpad_voicemail_tint">?attr/dialpad_text_color_secondary</item>
+ <item name="dialpad_voicemail_tint">@color/dialpad_icon_tint</item>
<item name="dialpad_background">@android:color/transparent</item>
- <item name="dialpad_separator_color">#7fffffff</item>
+ <item name="dialpad_separator_color">@color/dialpad_icon_tint</item>
<item name="dialpad_margin_style">@style/DialpadNoSpaceStyle</item>
<item name="dialpad_delete_padding">1dp</item>
</style>