summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-06-04 02:45:40 +0000
committerJim Miller <jaggies@google.com>2015-06-04 02:45:40 +0000
commit6433bd8f6a8c8a389f849409e322183ba68726d6 (patch)
tree7d3b599e4d415838d653f140d3e82f01300f5125 /res/values
parentcb8ccbb3b5907eb6deb9fbc74fb3b3de141028fb (diff)
downloadpackages_apps_Settings-6433bd8f6a8c8a389f849409e322183ba68726d6.zip
packages_apps_Settings-6433bd8f6a8c8a389f849409e322183ba68726d6.tar.gz
packages_apps_Settings-6433bd8f6a8c8a389f849409e322183ba68726d6.tar.bz2
Revert "Fix some dark theme issues"
This breaks the pattern entry screens of SecuritySettings. Reverting until we can take a closer look. This reverts commit cb8ccbb3b5907eb6deb9fbc74fb3b3de141028fb. Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml9
-rw-r--r--res/values/themes.xml2
2 files changed, 6 insertions, 5 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3508893..3bcf1ae 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -59,12 +59,12 @@
<color name="unlock_pattern_view_regular_color">@android:color/white</color>
<color name="unlock_pattern_view_error_color">#fff4511e</color>
- <color name="fingerprint_title_area_bg">?android:attr/colorAccent</color>
+ <color name="fingerprint_title_area_bg">#ff009688</color>
<color name="fingerprint_title_color">#ffffffff</color>
<color name="fingerprint_message_color">#de000000</color>
- <color name="fingerprint_progress_ring">?android:attr/colorAccent</color>
+ <color name="fingerprint_progress_ring">#ff009688</color>
<color name="fingerprint_progress_ring_bg">#20000000</color>
- <color name="fingerprint_dot_color">?android:attr/colorAccent</color>
+ <color name="fingerprint_dot_color">#ff009688</color>
<color name="running_processes_system_ram">#ff384248</color>
<color name="running_processes_apps_ram">#ff009587</color>
@@ -76,12 +76,13 @@
<color name="switch_accent_color">#ff7fcac3</color>
<color name="wifi_divider">#ffe0e0e0</color>
+ <color name="wifi_signal_icon_color">#ff009688</color>
<color name="sim_noitification">@*android:color/material_deep_teal_500</color>
<color name="warning">#ff5621</color>
<color name="confirm_device_credential_dark_background">#263238</color>
<color name="fab_ripple">#1fffffff</color><!-- 12% white -->
- <color name="fab_shape">?android:attr/colorAccent</color>
+ <color name="fab_shape">#ff009688</color><!-- Teal 500 -->
<color name="voice_interaction_highlight">#33b5e5</color>
<drawable name="fp_enrollment_header_landscape">#009688</drawable>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c2285e2..76fc04f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -93,7 +93,7 @@
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
- <item name="wifi_signal_color">?android:attr/colorAccent</item>
+ <item name="wifi_signal_color">@color/wifi_signal_icon_color</item>
<item name="side_margin">@dimen/settings_side_margin</item>
<!-- Redefine the ActionBar style for contentInsetStart -->