PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Error colors to point to frameworks instead of hard-coding them"" into nyc-mr1-dev

Browse Source
This commit is contained in:
Andrew Sapperstein
2016-07-21 00:57:01 +00:00
committed by Android (Google) Code Review
parent 391f67e484 f179f845e5
commit c49c496f1c
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/values/colors.xml
View File

@@ -50,14 +50,16 @@
<color name="setup_wizard_wifi_color_dark">#89ffffff</color>
<color name="setup_wizard_wifi_color_light">#89000000</color>
<color name="system_warning_color">#fff4511e</color><!-- deep orange 600 -->
<color name="lock_pattern_background">#00000000</color>
<color name="lock_pattern_view_regular_color">#ff37474f</color>
<color name="lock_pattern_view_error_color">@*android:color/system_error</color>
<color name="lock_pattern_view_error_color">@color/warning</color>
<color name="lock_pattern_view_regular_color_dark">#ffffff</color>
<color name="unlock_pattern_view_regular_color">@android:color/white</color>
<color name="unlock_pattern_view_error_color">@*android:color/system_error</color>
<color name="unlock_pattern_view_error_color">@color/system_warning_color</color>
<color name="fingerprint_title_area_bg">?android:attr/colorAccent</color>
<color name="fingerprint_title_color">#ffffffff</color>
@@ -74,6 +76,7 @@
<color name="wifi_divider">#ffe0e0e0</color>
<color name="sim_noitification">@*android:color/material_deep_teal_500</color>
<color name="warning">#ff5621</color>
<color name="confirm_device_credential_transparent_black">#60000000</color>
<color name="fab_ripple">#1fffffff</color><!-- 12% white -->
<color name="fab_shape">?android:attr/colorAccent</color>
@@ -88,7 +91,7 @@
<color name="memory_avg_use">#ff384248</color>
<color name="zen_rule_name_warning">@*android:color/system_error</color>
<color name="zen_rule_name_warning">@color/system_warning_color</color>
<!-- Accent color that matches the settings launcher icon -->
<color name="icon_accent">#ffabffec</color>

6
res/values/styles.xml
View File

@@ -219,7 +219,7 @@
<item name="android:textSize">12sp</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
<item name="android:textColor">@*android:color/system_error</item>
<item name="android:textColor">@color/warning</item>
</style>
<style name="wifi_item_content">
@@ -365,7 +365,7 @@
<style name="TextAppearance.FingerprintErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">@*android:color/system_error</item>
<item name="android:textColor">@color/warning</item>
</style>
<style name="TextAppearance.SupportTitle"
@@ -389,7 +389,7 @@
<style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">@*android:color/system_error</item>
<item name="android:textColor">@color/warning</item>
</style>
<style name="TextAppearance.Small.SwitchBar">