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

Commit 877553e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "New error color"

parents 17281408 2b283209

core/res/res/values/colors_material.xml

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ 


    <color name="button_material_dark">#ff5a595b</color>

    <color name="button_material_light">#ffd6d7d7</color>

    <color name="error_color_material">#F4511E</color>

    <color name="error_color_material_dark">#ff7043</color><!-- deep orange 400 -->

    <color name="error_color_material_light">#ff5722</color><!-- deep orange 500 -->



    <color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>

    <color name="switch_thumb_normal_material_light">#fff1f1f1</color>

core/res/res/values/themes_material.xml

+4 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ please see themes_device_defaults.xml. 
        <item name="primaryContentAlpha">@dimen/primary_content_alpha_material_dark</item>

        <item name="secondaryContentAlpha">@dimen/secondary_content_alpha_material_dark</item>

        <item name="backgroundDimAmount">0.6</item>

        <item name="colorError">@color/error_color_material</item>

        <item name="colorError">@color/error_color_material_dark</item>



        <!-- Text styles -->

        <item name="textAppearance">@style/TextAppearance.Material</item>
@@ -420,6 +420,7 @@ please see themes_device_defaults.xml. 
        <item name="primaryContentAlpha">@dimen/primary_content_alpha_material_light</item>

        <item name="secondaryContentAlpha">@dimen/secondary_content_alpha_material_light</item>

        <item name="backgroundDimAmount">0.6</item>

        <item name="colorError">@color/error_color_material_light</item>



        <!-- Text styles -->

        <item name="textAppearance">@style/TextAppearance.Material</item>
@@ -811,6 +812,7 @@ please see themes_device_defaults.xml. 
        <item name="colorBackground">@color/background_material_light</item>

        <item name="colorBackgroundFloating">@color/background_floating_material_light</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_light</item>

        <item name="colorError">@color/error_color_material_light</item>



        <item name="textColorPrimary">@color/text_color_primary</item>

        <item name="textColorPrimaryInverse">@color/primary_text_material_dark</item>
@@ -844,6 +846,7 @@ please see themes_device_defaults.xml. 
        <item name="colorBackground">@color/background_material_dark</item>

        <item name="colorBackgroundFloating">@color/background_floating_material_dark</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_dark</item>

        <item name="colorError">@color/error_color_material_dark</item>



        <item name="textColorPrimary">@color/text_color_primary</item>

        <item name="textColorPrimaryInverse">@color/primary_text_material_light</item>

packages/SystemUI/res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ 
        <item name="darkIconTheme">@style/DualToneDarkTheme</item>

        <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>

        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item>

        <item name="android:colorError">@*android:color/error_color_material_dark</item>

        <item name="android:colorControlHighlight">@*android:color/primary_text_material_dark</item>

        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>

        <item name="passwordStyle">@style/PasswordTheme</item>
@@ -317,6 +318,7 @@ 
    <style name="Theme.SystemUI.Light" parent="@*android:style/Theme.DeviceDefault.QuickSettings">

        <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item>

        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item>

        <item name="android:colorError">@*android:color/error_color_material_light</item>

        <item name="android:colorControlHighlight">@*android:color/primary_text_material_light</item>

        <item name="passwordStyle">@style/PasswordTheme.Light</item>

    </style>