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

Commit 13989d6d authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev

parents 4d7a6248 67f105bc

res/values/colors.xml

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ 
    <color name="title_color">@android:color/holo_blue_light</color>

    <color name="setup_divider_color_dark">#33ffffff</color>

    <color name="setup_divider_color_light">#33000000</color>

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

    <color name="setup_lock_pattern_view_regular_color_light">@color/lock_pattern_view_regular_color</color>

    <color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color>

    <color name="setup_lock_pattern_view_success_color_light">@color/setup_wizard_color_accent_light</color>

    <color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>

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

    <color name="setup_wizard_color_accent_dark">#ff00e4ff</color>

    <color name="setup_wizard_color_accent_light">#ff00828e</color>

    <color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>

res/values/themes.xml

+10 −0
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ 
        <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>

        <item name="wifi_signal">@drawable/wifi_signal_teal</item>

        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>



        <!-- LockPatternView colors -->

        <item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_dark</item>

        <item name="@*android:successColor">@color/setup_lock_pattern_view_success_color_dark</item>

        <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item>

    </style>



    <style name="SetupWizardTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
@@ -65,6 +70,11 @@ 
        <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>

        <item name="wifi_signal">@drawable/wifi_signal_teal</item>

        <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>



        <!-- LockPatternView colors -->

        <item name="@*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>

        <item name="@*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>

        <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>

    </style>



    <style name="Animation.SetupWizard" parent="@android:style/Animation.Activity">