Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e7bd8de authored by Matthew Fritze's avatar Matthew Fritze Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Error colors to point to frameworks rather than... 

Merge "Revert "Revert "Error colors to point to frameworks rather than hard-code them""" into nyc-mr1-dev
parents 22d09743 0cb33aef

core/res/res/values/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ 
    <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>
@@ -118,7 +120,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">#fff4511e</color>

    <color name="lock_pattern_view_error_color">@color/system_error</color>



    <!-- FaceLock -->

    <color name="facelock_spotlight_mask">#CC000000</color>

packages/SystemUI/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -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">#fff4511e</color><!-- deep orange 600 -->

    <color name="system_warning_color">@*android:color/system_error</color>

    <color name="qs_text">#FFFFFFFF</color>

    <color name="qs_tile_divider">#29ffffff</color><!-- 16% white -->

    <color name="qs_subhead">#99FFFFFF</color><!-- 60% white -->