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

Commit 2e425c6f authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes Ibff5b56f,I24f48aef 

* changes:
  Add null checks in BiometricService
  Update BiometricPrompt icons and logic
parents d3cb31d6 9f09df69

packages/SystemUI/res/drawable/face_dialog_error_to_face.xml

0 → 100644
+517 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/drawable/face_dialog_face_blue_to_checkmark.xml

0 → 100644
+637 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/drawable/face_dialog_face_gray_to_checkmark.xml

0 → 100644
+637 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/drawable/face_dialog_face_gray_to_face_blue.xml

0 → 100644
+178 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2019 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:aapt="http://schemas.android.com/aapt">

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

        <vector

            android:width="60dp"

            android:height="60dp"

            android:viewportHeight="60"

            android:viewportWidth="60">

            <group android:name="_R_G">

                <group

                    android:name="_R_G_L_0_G_N_1_T_0"

                    android:translateX="30"

                    android:translateY="30">

                    <group

                        android:name="_R_G_L_0_G"

                        android:translateX="-30"

                        android:translateY="-30">

                        <path

                            android:name="_R_G_L_0_G_D_0_P_0"

                            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:strokeAlpha="1"

                            android:strokeColor="@color/biometric_face_icon_gray"

                            android:strokeLineCap="round"

                            android:strokeLineJoin="round"

                            android:strokeWidth="2.5"

                            android:trimPathEnd="1"

                            android:trimPathOffset="0"

                            android:trimPathStart="0" />

                        <path

                            android:name="_R_G_L_0_G_D_1_P_0"

                            android:pathData=" M33.75 42.75 C32.75,43.76 31.37,44.39 29.83,44.39 C26.8,44.39 24.34,41.93 24.34,38.9 "

                            android:strokeAlpha="1"

                            android:strokeColor="@color/biometric_face_icon_gray"

                            android:strokeLineCap="round"

                            android:strokeLineJoin="round"

                            android:strokeWidth="2"

                            android:trimPathEnd="1"

                            android:trimPathOffset="0"

                            android:trimPathStart="0" />

                        <path

                            android:name="_R_G_L_0_G_D_2_P_0"

                            android:fillAlpha="1"

                            android:fillColor="@color/biometric_face_icon_gray"

                            android:fillType="nonZero"

                            android:pathData=" M39 23.8 C39,25 39.9,25.9 41.1,25.9 C42.2,25.9 43.2,25 43.2,23.8 C43.2,22.6 42.3,21.7 41.1,21.7 C39.9,21.7 39,22.6 39,23.8c " />

                        <path

                            android:name="_R_G_L_0_G_D_3_P_0"

                            android:fillAlpha="1"

                            android:fillColor="@color/biometric_face_icon_gray"

                            android:fillType="nonZero"

                            android:pathData=" M16.5 23.8 C16.5,25 17.4,25.9 18.6,25.9 C19.8,25.9 20.7,25 20.7,23.8 C20.7,22.6 19.8,21.7 18.6,21.7 C17.4,21.7 16.5,22.6 16.5,23.8c " />

                        <path

                            android:name="_R_G_L_0_G_D_4_P_0"

                            android:fillAlpha="1"

                            android:fillColor="@color/biometric_face_icon_gray"

                            android:fillType="nonZero"

                            android:pathData=" M32.9 34.7 C32.9,34.7 27.7,34.7 27.7,34.7 C27.7,34.7 27.7,32.7 27.7,32.7 C27.7,32.7 30.9,32.7 30.9,32.7 C30.9,32.7 30.9,28.2 30.9,28.2 C30.9,28.2 32.9,28.2 32.9,28.2 C32.9,28.2 32.9,34.7 32.9,34.7c " />

                    </group>

                </group>

            </group>

            <group android:name="time_group" />

        </vector>

    </aapt:attr>

    <target android:name="_R_G_L_0_G_D_0_P_0">

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

            <set android:ordering="together">

                <objectAnimator

                    android:duration="33"

                    android:propertyName="strokeColor"

                    android:startOffset="0"

                    android:valueFrom="@color/biometric_face_icon_gray"

                    android:valueTo="?android:attr/colorAccent"

                    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" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_D_1_P_0">

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

            <set android:ordering="together">

                <objectAnimator

                    android:duration="33"

                    android:propertyName="strokeColor"

                    android:startOffset="0"

                    android:valueFrom="@color/biometric_face_icon_gray"

                    android:valueTo="?android:attr/colorAccent"

                    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" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_D_2_P_0">

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

            <set android:ordering="together">

                <objectAnimator

                    android:duration="33"

                    android:propertyName="fillColor"

                    android:startOffset="0"

                    android:valueFrom="@color/biometric_face_icon_gray"

                    android:valueTo="?android:attr/colorAccent"

                    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" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_D_3_P_0">

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

            <set android:ordering="together">

                <objectAnimator

                    android:duration="33"

                    android:propertyName="fillColor"

                    android:startOffset="0"

                    android:valueFrom="@color/biometric_face_icon_gray"

                    android:valueTo="?android:attr/colorAccent"

                    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" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_D_4_P_0">

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

            <set android:ordering="together">

                <objectAnimator

                    android:duration="33"

                    android:propertyName="fillColor"

                    android:startOffset="0"

                    android:valueFrom="@color/biometric_face_icon_gray"

                    android:valueTo="?android:attr/colorAccent"

                    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" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="time_group">

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

            <set android:ordering="together">

                <objectAnimator

                    android:duration="50"

                    android:propertyName="translateX"

                    android:startOffset="0"

                    android:valueFrom="0"

                    android:valueTo="1"

                    android:valueType="floatType" />

            </set>

        </aapt:attr>

    </target>

</animated-vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/face_dialog_face_to_error.xml

0 → 100644
+473 −0

File added.

Preview size limit exceeded, changes collapsed.