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

Commit 2061cece authored by Hao Dong's avatar Hao Dong Committed by Android (Google) Code Review
Browse files

Merge "Update face checkmark color." into main

parents 0d819757 ee4a28bd

packages/SystemUI/res/drawable/face_dialog_dark_to_checkmark.xml

+5 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
                            <path

                                android:name="_R_G_L_0_G_D_0_P_0"

                                android:fillAlpha="0"

                                android:fillColor="@color/biometric_dialog_accent"

                                android:fillColor="@color/biometric_dialog_face_checkmark"

                                android:fillType="nonZero"

                                android:pathData=" M-116 -16.5 C-116,-16.5 -31.25,68.5 -31.25,68.5 C-31.25,68.5 108.75,-71.5 108.75,-71.5 "

                                android:trimPathStart="0"
@@ -58,7 +58,7 @@ 
                                android:pathData=" M-116 -16.5 C-116,-16.5 -31.25,68.5 -31.25,68.5 C-31.25,68.5 108.75,-71.5 108.75,-71.5 "

                                android:strokeWidth="20"

                                android:strokeAlpha="1"

                                android:strokeColor="@color/biometric_dialog_accent"

                                android:strokeColor="@color/biometric_dialog_face_checkmark"

                                android:trimPathStart="0"

                                android:trimPathEnd="0"

                                android:trimPathOffset="0" />
@@ -68,7 +68,7 @@ 
                            android:pathData=" M30 6.2 C16.9,6.2 6.3,16.8 6.3,30 C6.3,43.2 16.9,53.8 30,53.8 C43.1,53.8 53.8,43.2 53.8,30 C53.8,16.8 43.1,6.2 30,6.2c "

                            android:strokeWidth="2.5"

                            android:strokeAlpha="1"

                            android:strokeColor="@color/biometric_dialog_accent"

                            android:strokeColor="@color/biometric_dialog_face_checkmark"

                            android:trimPathStart="0"

                            android:trimPathEnd="1"

                            android:trimPathOffset="0" />
@@ -387,7 +387,7 @@ 
                    android:propertyName="strokeColor"

                    android:startOffset="0"

                    android:valueFrom="@color/biometric_dialog_accent"

                    android:valueTo="@color/biometric_dialog_accent"

                    android:valueTo="@color/biometric_dialog_face_checkmark"

                    android:valueType="colorType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
@@ -398,7 +398,7 @@ 
                    android:propertyName="strokeColor"

                    android:startOffset="67"

                    android:valueFrom="@color/biometric_dialog_accent"

                    android:valueTo="@color/biometric_dialog_accent"

                    android:valueTo="@color/biometric_dialog_face_checkmark"

                    android:valueType="colorType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />

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

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
    <color name="biometric_dialog_gray">#ffcccccc</color>

    <color name="biometric_dialog_accent">@color/material_dynamic_primary70</color>

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

    <color name="biometric_dialog_face_checkmark">#5bb974</color> <!-- green 400 -->



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

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

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ 
    <color name="biometric_dialog_gray">#ff757575</color>

    <color name="biometric_dialog_accent">@color/material_dynamic_primary40</color>

    <color name="biometric_dialog_error">#ffd93025</color>                  <!-- red 600 -->

    <color name="biometric_dialog_face_checkmark">#34A853</color> <!-- green 500 -->



    <!-- SFPS colors -->

    <color name="sfps_chevron_fill">@color/material_dynamic_primary90</color>