Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Error colors to point to frameworks rather than hard-code 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 433a19e8bf 7c11e933d5
commit 22d09743d8
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/colors.xml
View File

@@ -74,8 +74,6 @@
<drawable name="input_method_fullscreen_background">#fff9f9f9</drawable>
<color name="input_method_navigation_guard">#ff000000</color>
<color name="system_error">#fff4511e</color> <!-- deep orange 600 -->
<!-- For date picker widget -->
<drawable name="selected_day_background">#ff0092f4</drawable>
@@ -120,7 +118,7 @@
<!-- LockPatternView -->
<color name="lock_pattern_view_regular_color">#ffffffff</color>
<color name="lock_pattern_view_success_color">#ffffffff</color>
<color name="lock_pattern_view_error_color">@color/system_error</color>
<color name="lock_pattern_view_error_color">#fff4511e</color>
<!-- FaceLock -->
<color name="facelock_spotlight_mask">#CC000000</color>

2
packages/SystemUI/res/values/colors.xml
View File

@@ -30,7 +30,7 @@
<color name="batterymeter_charge_color">#FFFFFFFF</color>
<color name="batterymeter_bolt_color">#FFFFFFFF</color>
<color name="qs_batterymeter_frame_color">#FF404040</color>
<color name="system_warning_color">@*android:color/system_error</color>
<color name="system_warning_color">#fff4511e</color><!-- deep orange 600 -->
<color name="qs_text">#FFFFFFFF</color>
<color name="qs_tile_divider">#29ffffff</color><!-- 16% white -->
<color name="qs_subhead">#99FFFFFF</color><!-- 60% white -->