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

Commit 0be1f337 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

2/n: Refactor common code from FingerprintDialogView 

Bug: 111461540

Test: BiometricPromptDemo works
Change-Id: I7077b062f1da0e084a38d5d53248123a82456a48
parent a883fb5f

packages/SystemUI/res/drawable/fingerprint_dialog_bg.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <solid android:color="@color/fingerprint_dialog_bg_color" />

    <solid android:color="@color/biometric_dialog_bg_color" />

    <corners android:radius="1dp"

        android:topLeftRadius="@dimen/fingerprint_dialog_corner_size"

        android:topRightRadius="@dimen/fingerprint_dialog_corner_size"

        android:topLeftRadius="@dimen/biometric_dialog_corner_size"

        android:topRightRadius="@dimen/biometric_dialog_corner_size"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="0dp"/>

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/fingerprint_dialog_error_to_fp.xml

+8 −8
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
                        android:name="_R_G_L_2_G_D_0_P_0"

                        android:pathData=" M-25.36 -24.41 C-25.93,-24.31 -26.49,-24.27 -26.81,-24.27 C-28.11,-24.27 -29.35,-24.62 -30.43,-25.4 C-32.11,-26.6 -33.2,-28.57 -33.2,-30.79 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -47,7 +47,7 @@ 
                        android:name="_R_G_L_2_G_D_1_P_0"

                        android:pathData=" M-36.14 -21.78 C-37.15,-22.98 -37.72,-23.7 -38.51,-25.29 C-39.33,-26.94 -39.82,-28.78 -39.82,-30.77 C-39.82,-34.43 -36.85,-37.4 -33.19,-37.4 C-29.52,-37.4 -26.55,-34.43 -26.55,-30.77 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -58,7 +58,7 @@ 
                        android:name="_R_G_L_2_G_D_2_P_0"

                        android:pathData=" M-42.19 -25.68 C-42.95,-27.82 -43.09,-29.54 -43.09,-30.8 C-43.09,-32.27 -42.84,-33.65 -42.27,-34.9 C-40.71,-38.35 -37.24,-40.75 -33.2,-40.75 C-27.71,-40.75 -23.26,-36.3 -23.26,-30.8 C-23.26,-28.97 -24.74,-27.49 -26.57,-27.49 C-28.4,-27.49 -29.89,-28.97 -29.89,-30.8 C-29.89,-32.64 -31.37,-34.12 -33.2,-34.12 C-35.04,-34.12 -36.52,-32.64 -36.52,-30.8 C-36.52,-28.23 -35.53,-25.92 -33.92,-24.22 C-32.69,-22.93 -31.48,-22.12 -29.44,-21.53 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -69,7 +69,7 @@ 
                        android:name="_R_G_L_2_G_D_3_P_0"

                        android:pathData=" M-44.06 -38.17 C-42.87,-39.94 -41.39,-41.41 -39.51,-42.44 C-37.62,-43.47 -35.46,-44.05 -33.16,-44.05 C-30.88,-44.05 -28.72,-43.47 -26.85,-42.45 C-24.97,-41.43 -23.48,-39.97 -22.29,-38.21 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -80,7 +80,7 @@ 
                        android:name="_R_G_L_2_G_D_4_P_0"

                        android:pathData=" M-25.72 -45.45 C-27.99,-46.76 -30.43,-47.52 -33.28,-47.52 C-36.13,-47.52 -38.51,-46.74 -40.62,-45.45 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -97,7 +97,7 @@ 
                        android:name="_R_G_L_1_G_D_0_P_0"

                        android:pathData=" M0 -9 C4.97,-9 9,-4.97 9,0 C9,4.97 4.97,9 0,9 C-4.97,9 -9,4.97 -9,0 C-9,-4.97 -4.97,-9 0,-9c "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_error_color"

                        android:strokeColor="@color/biometric_dialog_error_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="2"
@@ -118,7 +118,7 @@ 
                        <path

                            android:name="_R_G_L_0_G_D_0_P_0"

                            android:fillAlpha="1"

                            android:fillColor="@color/fingerprint_dialog_error_color"

                            android:fillColor="@color/biometric_dialog_error_color"

                            android:fillType="nonZero"

                            android:pathData=" M1.1 3.94 C1.1,4.55 0.61,5.04 0,5.04 C-0.61,5.04 -1.1,4.55 -1.1,3.94 C-1.1,3.33 -0.61,2.84 0,2.84 C0.61,2.84 1.1,3.33 1.1,3.94c " />

                    </group>
@@ -131,7 +131,7 @@ 
                        <path

                            android:name="_R_G_L_0_G_D_0_P_1"

                            android:fillAlpha="1"

                            android:fillColor="@color/fingerprint_dialog_error_color"

                            android:fillColor="@color/biometric_dialog_error_color"

                            android:fillType="nonZero"

                            android:pathData=" M1 -4.06 C1,-4.06 1,-0.06 1,-0.06 C1,0.49 0.55,0.94 0,0.94 C-0.55,0.94 -1,0.49 -1,-0.06 C-1,-0.06 -1,-4.06 -1,-4.06 C-1,-4.61 -0.55,-5.06 0,-5.06 C0.55,-5.06 1,-4.61 1,-4.06c " />

                    </group>

packages/SystemUI/res/drawable/fingerprint_dialog_fp_to_error.xml

+13 −13
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
                        android:name="_R_G_L_3_G_D_0_P_0"

                        android:pathData=" M-25.36 -24.41 C-25.93,-24.31 -26.49,-24.27 -26.81,-24.27 C-28.11,-24.27 -29.35,-24.62 -30.43,-25.4 C-32.11,-26.6 -33.2,-28.57 -33.2,-30.79 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -47,7 +47,7 @@ 
                        android:name="_R_G_L_3_G_D_1_P_0"

                        android:pathData=" M-36.14 -21.78 C-37.15,-22.98 -37.72,-23.7 -38.51,-25.29 C-39.33,-26.94 -39.82,-28.78 -39.82,-30.77 C-39.82,-34.43 -36.85,-37.4 -33.19,-37.4 C-29.52,-37.4 -26.55,-34.43 -26.55,-30.77 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -58,7 +58,7 @@ 
                        android:name="_R_G_L_3_G_D_2_P_0"

                        android:pathData=" M-42.19 -25.68 C-42.95,-27.82 -43.09,-29.54 -43.09,-30.8 C-43.09,-32.27 -42.84,-33.65 -42.27,-34.9 C-40.71,-38.35 -37.24,-40.75 -33.2,-40.75 C-27.71,-40.75 -23.26,-36.3 -23.26,-30.8 C-23.26,-28.97 -24.74,-27.49 -26.57,-27.49 C-28.4,-27.49 -29.89,-28.97 -29.89,-30.8 C-29.89,-32.64 -31.37,-34.12 -33.2,-34.12 C-35.04,-34.12 -36.52,-32.64 -36.52,-30.8 C-36.52,-28.23 -35.53,-25.92 -33.92,-24.22 C-32.69,-22.93 -31.48,-22.12 -29.44,-21.53 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -69,7 +69,7 @@ 
                        android:name="_R_G_L_3_G_D_3_P_0"

                        android:pathData=" M-44.06 -38.17 C-42.87,-39.94 -41.39,-41.41 -39.51,-42.44 C-37.62,-43.47 -35.46,-44.05 -33.16,-44.05 C-30.88,-44.05 -28.72,-43.47 -26.85,-42.45 C-24.97,-41.43 -23.48,-39.97 -22.29,-38.21 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -80,7 +80,7 @@ 
                        android:name="_R_G_L_3_G_D_4_P_0"

                        android:pathData=" M-25.72 -45.45 C-27.99,-46.76 -30.43,-47.52 -33.28,-47.52 C-36.13,-47.52 -38.51,-46.74 -40.62,-45.45 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_fingerprint_color"

                        android:strokeColor="@color/biometric_dialog_biometric_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -101,7 +101,7 @@ 
                        android:name="_R_G_L_2_G_D_0_P_0"

                        android:pathData=" M-25.36 -24.41 C-25.93,-24.31 -26.49,-24.27 -26.81,-24.27 C-28.11,-24.27 -29.35,-24.62 -30.43,-25.4 C-32.11,-26.6 -33.2,-28.57 -33.2,-30.79 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_error_color"

                        android:strokeColor="@color/biometric_dialog_error_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -112,7 +112,7 @@ 
                        android:name="_R_G_L_2_G_D_1_P_0"

                        android:pathData=" M-36.14 -21.78 C-37.15,-22.98 -37.72,-23.7 -38.51,-25.29 C-39.33,-26.94 -39.82,-28.78 -39.82,-30.77 C-39.82,-34.43 -36.85,-37.4 -33.19,-37.4 C-29.52,-37.4 -26.55,-34.43 -26.55,-30.77 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_error_color"

                        android:strokeColor="@color/biometric_dialog_error_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -123,7 +123,7 @@ 
                        android:name="_R_G_L_2_G_D_2_P_0"

                        android:pathData=" M-42.19 -25.68 C-42.95,-27.82 -43.09,-29.54 -43.09,-30.8 C-43.09,-32.27 -42.84,-33.65 -42.27,-34.9 C-40.71,-38.35 -37.24,-40.75 -33.2,-40.75 C-27.71,-40.75 -23.26,-36.3 -23.26,-30.8 C-23.26,-28.97 -24.74,-27.49 -26.57,-27.49 C-28.4,-27.49 -29.89,-28.97 -29.89,-30.8 C-29.89,-32.64 -31.37,-34.12 -33.2,-34.12 C-35.04,-34.12 -36.52,-32.64 -36.52,-30.8 C-36.52,-28.23 -35.53,-25.92 -33.92,-24.22 C-32.69,-22.93 -31.48,-22.12 -29.44,-21.53 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_error_color"

                        android:strokeColor="@color/biometric_dialog_error_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -134,7 +134,7 @@ 
                        android:name="_R_G_L_2_G_D_3_P_0"

                        android:pathData=" M-44.06 -38.17 C-42.87,-39.94 -41.39,-41.41 -39.51,-42.44 C-37.62,-43.47 -35.46,-44.05 -33.16,-44.05 C-30.88,-44.05 -28.72,-43.47 -26.85,-42.45 C-24.97,-41.43 -23.48,-39.97 -22.29,-38.21 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_error_color"

                        android:strokeColor="@color/biometric_dialog_error_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -145,7 +145,7 @@ 
                        android:name="_R_G_L_2_G_D_4_P_0"

                        android:pathData=" M-25.72 -45.45 C-27.99,-46.76 -30.43,-47.52 -33.28,-47.52 C-36.13,-47.52 -38.51,-46.74 -40.62,-45.45 "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_error_color"

                        android:strokeColor="@color/biometric_dialog_error_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="1.45"
@@ -162,7 +162,7 @@ 
                        android:name="_R_G_L_1_G_D_0_P_0"

                        android:pathData=" M0 -9 C4.97,-9 9,-4.97 9,0 C9,4.97 4.97,9 0,9 C-4.97,9 -9,4.97 -9,0 C-9,-4.97 -4.97,-9 0,-9c "

                        android:strokeAlpha="1"

                        android:strokeColor="@color/fingerprint_dialog_error_color"

                        android:strokeColor="@color/biometric_dialog_error_color"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="2"
@@ -183,7 +183,7 @@ 
                        <path

                            android:name="_R_G_L_0_G_D_0_P_0"

                            android:fillAlpha="1"

                            android:fillColor="@color/fingerprint_dialog_error_color"

                            android:fillColor="@color/biometric_dialog_error_color"

                            android:fillType="nonZero"

                            android:pathData=" M1.1 3.94 C1.1,4.55 0.61,5.04 0,5.04 C-0.61,5.04 -1.1,4.55 -1.1,3.94 C-1.1,3.33 -0.61,2.84 0,2.84 C0.61,2.84 1.1,3.33 1.1,3.94c " />

                    </group>
@@ -196,7 +196,7 @@ 
                        <path

                            android:name="_R_G_L_0_G_D_0_P_1"

                            android:fillAlpha="1"

                            android:fillColor="@color/fingerprint_dialog_error_color"

                            android:fillColor="@color/biometric_dialog_error_color"

                            android:fillType="nonZero"

                            android:pathData=" M1 -4.06 C1,-4.06 1,-0.06 1,-0.06 C1,0.49 0.55,0.94 0,0.94 C-0.55,0.94 -1,0.49 -1,-0.06 C-1,-0.06 -1,-4.06 -1,-4.06 C-1,-4.61 -0.55,-5.06 0,-5.06 C0.55,-5.06 1,-4.61 1,-4.06c " />

                    </group>

packages/SystemUI/res/layout/fingerprint_dialog.xml

+7 −7
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="bottom"

    android:background="@color/fingerprint_dialog_dim_color"

    android:background="@color/biometric_dialog_dim_color"

    android:orientation="vertical">



    <!-- This is not a Space since Spaces cannot be clicked -->
@@ -63,7 +63,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:marqueeRepeatLimit="marquee_forever"

                android:textColor="@color/fingerprint_dialog_text_dark_color"/>

                android:textColor="@color/biometric_dialog_text_dark_color"/>



            <TextView

                android:id="@+id/subtitle"
@@ -78,7 +78,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:marqueeRepeatLimit="marquee_forever"

                android:textColor="@color/fingerprint_dialog_text_dark_color"/>

                android:textColor="@color/biometric_dialog_text_dark_color"/>



            <TextView

                android:id="@+id/description"
@@ -90,12 +90,12 @@ 
                android:paddingTop="8dp"

                android:textSize="16sp"

                android:maxLines="4"

                android:textColor="@color/fingerprint_dialog_text_dark_color"/>

                android:textColor="@color/biometric_dialog_text_dark_color"/>



            <ImageView

                android:id="@+id/fingerprint_icon"

                android:layout_width="@dimen/fingerprint_dialog_fp_icon_size"

                android:layout_height="@dimen/fingerprint_dialog_fp_icon_size"

                android:layout_width="@dimen/biometric_dialog_biometric_icon_size"

                android:layout_height="@dimen/biometric_dialog_biometric_icon_size"

                android:layout_gravity="center_horizontal"

                android:layout_marginTop="48dp"

                android:scaleType="fitXY"
@@ -114,7 +114,7 @@ 
                android:accessibilityLiveRegion="polite"

                android:text="@string/fingerprint_dialog_touch_sensor"

                android:contentDescription="@string/accessibility_fingerprint_dialog_help_area"

                android:textColor="@color/fingerprint_dialog_text_light_color"/>

                android:textColor="@color/biometric_dialog_text_light_color"/>



            <LinearLayout

                android:layout_width="match_parent"

packages/SystemUI/res/values/colors.xml

+7 −7
Original line number Diff line number Diff line
@@ -160,13 +160,13 @@ 
    <color name="smart_reply_button_background">#ffffffff</color>

    <color name="smart_reply_button_stroke">#ffdadce0</color>



    <!-- Fingerprint dialog colors -->

    <color name="fingerprint_dialog_bg_color">#ffffffff</color> <!-- 100% white -->

    <color name="fingerprint_dialog_text_dark_color">#dd000000</color> <!-- 87% black -->

    <color name="fingerprint_dialog_text_light_color">#89000000</color> <!-- 54% black -->

    <color name="fingerprint_dialog_dim_color">#80000000</color> <!-- 50% black -->

    <color name="fingerprint_dialog_error_color">#fff44336</color> <!-- red -->

    <color name="fingerprint_dialog_fingerprint_color">#ff008577</color> <!-- teal -->

    <!-- Biometric dialog colors -->

    <color name="biometric_dialog_bg_color">#ffffffff</color> <!-- 100% white -->

    <color name="biometric_dialog_text_dark_color">#dd000000</color> <!-- 87% black -->

    <color name="biometric_dialog_text_light_color">#89000000</color> <!-- 54% black -->

    <color name="biometric_dialog_dim_color">#80000000</color> <!-- 50% black -->

    <color name="biometric_dialog_error_color">#fff44336</color> <!-- red -->

    <color name="biometric_dialog_biometric_color">#ff008577</color> <!-- teal -->



    <!-- Logout button -->

    <color name="logout_button_bg_color">#ccffffff</color>