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

Commit bd68fac9 authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] Update the fingerprint enrollment color when device... 

Merge "[DO NOT MERGE] Update the fingerprint enrollment color when device dark/light theme color changes" into tm-qpr-dev
parents 055796e8 1478326b

packages/SystemUI/res/drawable/udfps_enroll_checkmark.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
        android:fillType="evenOdd"/>

    <path

        android:pathData="M27,0C12.088,0 0,12.088 0,27C0,41.912 12.088,54 27,54C41.912,54 54,41.912 54,27C54,12.088 41.912,0 27,0ZM27,3.962C39.703,3.962 50.037,14.297 50.037,27C50.037,39.703 39.703,50.038 27,50.038C14.297,50.038 3.963,39.703 3.963,27C3.963,14.297 14.297,3.962 27,3.962Z"

        android:fillColor="@color/udfps_enroll_progress"

        android:fillColor="?attr/biometricsEnrollProgress"

        android:fillType="evenOdd"/>

    <path

        android:pathData="M23.0899,38.8534L10.4199,26.1824L13.2479,23.3544L23.0899,33.1974L41.2389,15.0474L44.0679,17.8754L23.0899,38.8534Z"

        android:fillColor="@color/udfps_enroll_progress"

        android:fillColor="?attr/biometricsEnrollProgress"

        android:fillType="evenOdd"/>

</vector>

packages/SystemUI/res/values-night/colors.xml

+9 −3
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ 
    <color name="biometric_dialog_accent">@color/material_dynamic_primary70</color>

    <color name="biometric_dialog_error">#fff28b82</color> <!-- red 300 -->



    <!-- UDFPS colors -->

    <color name="udfps_enroll_icon">#7DA7F1</color>



    <color name="GM2_green_500">#FF41Af6A</color>

    <color name="GM2_blue_500">#5195EA</color>

    <color name="GM2_red_500">#E25142</color>
@@ -101,4 +98,13 @@ 
    <color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% -->



    <color name="people_tile_background">@color/material_dynamic_secondary20</color>



    <!-- UDFPS colors -->

    <color name="udfps_enroll_icon">#7DA7F1</color>

    <color name="udfps_moving_target_fill">#475670</color>

    <!-- 50% of udfps_moving_target_fill-->

    <color name="udfps_moving_target_fill_error">#80475670</color>

    <color name="udfps_enroll_progress">#7DA7F1</color>

    <color name="udfps_enroll_progress_help">#607DA7F1</color>

    <color name="udfps_enroll_progress_help_with_talkback">#FFEE675C</color>

</resources>

packages/SystemUI/res/values/attrs.xml

+10 −0
Original line number Diff line number Diff line
@@ -204,5 +204,15 @@ 
        <attr name="passwordTextAppearance" format="reference" />

        <attr name="errorTextAppearance" format="reference"/>

    </declare-styleable>



    <declare-styleable name="BiometricsEnrollView">

        <attr name="biometricsEnrollStyle" format="reference" />

        <attr name="biometricsEnrollIcon" format="reference|color" />

        <attr name="biometricsMovingTargetFill" format="reference|color" />

        <attr name="biometricsMovingTargetFillError" format="reference|color" />

        <attr name="biometricsEnrollProgress" format="reference|color" />

        <attr name="biometricsEnrollProgressHelp" format="reference|color" />

        <attr name="biometricsEnrollProgressHelpWithTalkback" format="reference|color" />

    </declare-styleable>

</resources>

packages/SystemUI/res/values/colors.xml

+5 −5
Original line number Diff line number Diff line
@@ -134,12 +134,12 @@ 
    <color name="biometric_dialog_error">#ffd93025</color>                  <!-- red 600 -->



    <!-- UDFPS colors -->

    <color name="udfps_enroll_icon">#7DA7F1</color>

    <color name="udfps_moving_target_fill">#475670</color>

    <color name="udfps_enroll_icon">#699FF3</color>

    <color name="udfps_moving_target_fill">#C2D7F7</color>

    <!-- 50% of udfps_moving_target_fill-->

    <color name="udfps_moving_target_fill_error">#80475670</color>

    <color name="udfps_enroll_progress">#7DA7F1</color>

    <color name="udfps_enroll_progress_help">#607DA7F1</color>

    <color name="udfps_moving_target_fill_error">#80C2D7F7</color>

    <color name="udfps_enroll_progress">#699FF3</color>

    <color name="udfps_enroll_progress_help">#70699FF3</color>

    <color name="udfps_enroll_progress_help_with_talkback">#FFEE675C</color>



    <!-- Floating overlay actions -->

packages/SystemUI/res/values/styles.xml

+13 −0
Original line number Diff line number Diff line
@@ -308,6 +308,10 @@ 


        <!-- Needed for MediaRoute chooser dialog -->

        <item name="*android:isLightTheme">false</item>



        <!-- Biometrics enroll color style -->

        <item name="biometricsEnrollStyle">@style/BiometricsEnrollStyle</item>



    </style>



    <style name="Theme.SystemUI.LightWallpaper">
@@ -1274,4 +1278,13 @@ 
        <item name="android:textColor">?androidprv:attr/textColorOnAccent</item>

        <item name="android:textSize">@dimen/broadcast_dialog_btn_text_size</item>

    </style>



    <style name="BiometricsEnrollStyle">

        <item name="biometricsEnrollIcon">@color/udfps_enroll_icon</item>

        <item name="biometricsMovingTargetFill">@color/udfps_moving_target_fill</item>

        <item name="biometricsMovingTargetFillError">@color/udfps_moving_target_fill_error</item>

        <item name="biometricsEnrollProgress">@color/udfps_enroll_progress</item>

        <item name="biometricsEnrollProgressHelp">@color/udfps_enroll_progress_help</item>

        <item name="biometricsEnrollProgressHelpWithTalkback">@color/udfps_enroll_progress_help_with_talkback</item>

    </style>

</resources>