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

Commit 834ee122 authored by Pasty Chang's avatar Pasty Chang Committed by Android (Google) Code Review
Browse files

Merge "Remove attribute colorError from settings glif theme"

parents 355bb4d7 9ad817d5

res/values/colors.xml

+0 −2
Original line number Diff line number Diff line
@@ -108,8 +108,6 @@ 
    <color name="switchbar_switch_track_tint">#BFFFFFFF</color>

    <color name="switchbar_switch_thumb_tint">@android:color/white</color>



    <color name="glif_error_color">@*android:color/material_red_A700</color>



    <color name="battery_good_color_light">#43a047</color> <!-- Material Green 600 -->

    <color name="battery_maybe_color_light">#ef6c00</color> <!-- Material Orange 800 -->

    <color name="battery_bad_color_light">#f44336</color> <!-- Material Red 500 -->

res/values/themes_suw.xml

+0 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 
        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>



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

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

    </style>



    <style name="GlifV2Theme" parent="SudThemeGlifV2.DayNight">
@@ -90,7 +89,6 @@ 
        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>



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

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

    </style>



    <style name="GlifV3Theme" parent="SudThemeGlifV3.DayNight">
@@ -133,7 +131,6 @@ 
        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>



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

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

    </style>



    <style name="GlifV2Theme.Transparent">