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

Commit c2d11b3f authored by Lucas Dupin's avatar Lucas Dupin
Browse files

New lock states and animation 

Bug: 111414690
Fixes: 124076337
Test: manually lock/unlock using biometrics or pin
Change-Id: I6e920f06f448c61f17b3cecfe1962deb83a37d33
parent 132f0b31

core/res/res/anim/lock_scanning.xml

0 → 100644
+371 −0
Original line number Diff line number Diff line 
<!--

     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:height="32dp" android:width="32dp" android:viewportHeight="32"

                android:viewportWidth="32">

            <group android:name="_R_G">

                <group android:name="_R_G_L_2_G_N_1_T_0" android:pivotX="16" android:pivotY="16"

                       android:scaleX="1.5" android:scaleY="1.5">

                    <group android:name="_R_G_L_2_G" android:translateX="7.75"

                           android:translateY="10.670000000000002" android:pivotX="8.25"

                           android:pivotY="7.25" android:scaleX="0.64" android:scaleY="0.64">

                        <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/textColor"

                              android:fillAlpha="1" android:fillType="nonZero"

                              android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c  M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c "/>

                    </group>

                </group>

                <group android:name="_R_G_L_1_G_N_4_N_1_T_0" android:pivotX="16" android:pivotY="16"

                       android:scaleX="1.5" android:scaleY="1.5">

                    <group android:name="_R_G_L_1_G_N_4_T_0" android:translateX="7.75"

                           android:translateY="10.670000000000002" android:pivotX="8.25"

                           android:pivotY="7.25" android:scaleX="0.64" android:scaleY="0.64">

                        <group android:name="_R_G_L_1_G" android:translateX="6"

                               android:translateY="5" android:pivotX="2.25" android:pivotY="2.25"

                               android:scaleX="1" android:scaleY="1">

                            <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/textColor"

                                  android:fillAlpha="1" android:fillType="nonZero"

                                  android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "/>

                        </group>

                    </group>

                </group>

                <group android:name="_R_G_L_0_G_N_4_N_1_T_0" android:pivotX="16" android:pivotY="16"

                       android:scaleX="1.5" android:scaleY="1.5">

                    <group android:name="_R_G_L_0_G_N_4_T_0" android:translateX="7.75"

                           android:translateY="10.670000000000002" android:pivotX="8.25"

                           android:pivotY="7.25" android:scaleX="0.64" android:scaleY="0.64">

                        <group android:name="_R_G_L_0_G_T_1" android:translateX="8.25"

                               android:translateY="1.121" android:scaleX="0.125"

                               android:scaleY="0.125">

                            <group android:name="_R_G_L_0_G" android:translateY="25.029">

                                <path android:name="_R_G_L_0_G_D_0_P_0"

                                      android:strokeColor="?attr/textColor" android:strokeLineCap="round"

                                      android:strokeLineJoin="round" android:strokeWidth="16"

                                      android:strokeAlpha="1"

                                      android:pathData=" M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 "/>

                            </group>

                        </group>

                    </group>

                </group>

            </group>

            <group android:name="time_group"/>

        </vector>

    </aapt:attr>

    <target android:name="_R_G_L_2_G">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="scaleX" android:duration="83"

                                android:startOffset="0" android:valueFrom="0.64"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="83"

                                android:startOffset="0" android:valueFrom="0.64"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="83"

                                android:startOffset="83" android:valueFrom="0.64"

                                android:valueTo="0.62" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="83"

                                android:startOffset="83" android:valueFrom="0.64"

                                android:valueTo="0.62" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="183"

                                android:startOffset="167" android:valueFrom="0.62"

                                android:valueTo="0.8" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="183"

                                android:startOffset="167" android:valueFrom="0.62"

                                android:valueTo="0.8" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="250"

                                android:startOffset="350" android:valueFrom="0.8"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="250"

                                android:startOffset="350" android:valueFrom="0.8"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_1_G">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="scaleX" android:duration="150"

                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"

                                android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="150"

                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"

                                android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="117"

                                android:startOffset="150" android:valueFrom="1"

                                android:valueTo="0.6" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="117"

                                android:startOffset="150" android:valueFrom="1"

                                android:valueTo="0.6" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="333"

                                android:startOffset="267" android:valueFrom="0.6"

                                android:valueTo="1" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="333"

                                android:startOffset="267" android:valueFrom="0.6"

                                android:valueTo="1" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_1_G_N_4_T_0">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="scaleX" android:duration="83"

                                android:startOffset="0" android:valueFrom="0.64"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="83"

                                android:startOffset="0" android:valueFrom="0.64"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="83"

                                android:startOffset="83" android:valueFrom="0.64"

                                android:valueTo="0.62" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="83"

                                android:startOffset="83" android:valueFrom="0.64"

                                android:valueTo="0.62" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="183"

                                android:startOffset="167" android:valueFrom="0.62"

                                android:valueTo="0.8" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="183"

                                android:startOffset="167" android:valueFrom="0.62"

                                android:valueTo="0.8" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="250"

                                android:startOffset="350" android:valueFrom="0.8"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="250"

                                android:startOffset="350" android:valueFrom="0.8"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_D_0_P_0">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="pathData" android:duration="83"

                                android:startOffset="0"

                                android:valueFrom="M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 "

                                android:valueTo="M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 "

                                android:valueType="pathType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="pathData" android:duration="150"

                                android:startOffset="83"

                                android:valueFrom="M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 "

                                android:valueTo="M-28.02 -43.42 C-28.02,-43.42 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.76,-43.67 27.76,-43.67 "

                                android:valueType="pathType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="pathData" android:duration="117"

                                android:startOffset="233"

                                android:valueFrom="M-28.02 -43.42 C-28.02,-43.42 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.76,-43.67 27.76,-43.67 "

                                android:valueTo="M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 "

                                android:valueType="pathType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_T_1">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="translateY" android:duration="83"

                                android:startOffset="0" android:valueFrom="1.121"

                                android:valueTo="1.121" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="translateY" android:duration="150"

                                android:startOffset="83" android:valueFrom="1.121"

                                android:valueTo="3.749" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="translateY" android:duration="117"

                                android:startOffset="233" android:valueFrom="3.749"

                                android:valueTo="1.121" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_N_4_T_0">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="scaleX" android:duration="83"

                                android:startOffset="0" android:valueFrom="0.64"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="83"

                                android:startOffset="0" android:valueFrom="0.64"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="83"

                                android:startOffset="83" android:valueFrom="0.64"

                                android:valueTo="0.62" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="83"

                                android:startOffset="83" android:valueFrom="0.64"

                                android:valueTo="0.62" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="183"

                                android:startOffset="167" android:valueFrom="0.62"

                                android:valueTo="0.8" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="183"

                                android:startOffset="167" android:valueFrom="0.62"

                                android:valueTo="0.8" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleX" android:duration="250"

                                android:startOffset="350" android:valueFrom="0.8"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="scaleY" android:duration="250"

                                android:startOffset="350" android:valueFrom="0.8"

                                android:valueTo="0.64" android:valueType="floatType">

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 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:propertyName="translateX" android:duration="1000"

                                android:startOffset="0" android:valueFrom="0" android:valueTo="1"

                                android:valueType="floatType"/>

            </set>

        </aapt:attr>

    </target>

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

core/res/res/anim/lock_to_error.xml

+106 −481

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/drawable/ic_auth_error.xml

deleted100644 → 0
+0 −23

File deleted.

Preview size limit exceeded, changes collapsed.

core/res/res/values/symbols.xml

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.