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

Commit 70295818 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Replace lock icon" into qt-dev 

am: be9cfb23

Change-Id: I83d4eef5757536bee63d70b7d8934ce1d711f088
parents b16ab3b9 be9cfb23

core/res/res/anim/lock_in.xml

100755 → 100644
+93 −162
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2019 The Android Open Source Project

<!-- 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.
@@ -16,102 +15,116 @@ 
<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"

        <vector android:height="42dp" android:width="32dp" android:viewportHeight="42"

                android:viewportWidth="32">

            <group android:name="_R_G">

                <group android:name="_R_G_L_2_G_N_2_N_1_T_0" android:translateX="16"

                       android:translateY="16" android:scaleX="1.3" android:scaleY="1.3">

                    <group android:name="_R_G_L_2_G_N_2_T_0" android:translateX="-2.25"

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

                           android:scaleX="0" android:scaleY="0">

                        <group android:name="_R_G_L_2_G_T_1" android:translateX="2.25"

                               android:translateY="2.373" android:scaleX="0.12346"

                               android:scaleY="0.12346">

                            <group android:name="_R_G_L_2_G" android:translateY="32">

                                <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#ff0000"

                                      android:fillAlpha="0" android:fillType="nonZero"

                                      android:trimPathStart="0.14" android:trimPathEnd="0.89"

                                      android:trimPathOffset="0"

                                      android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -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.97,-31.67 27.97,-31.67 "/>

                                <path android:name="_R_G_L_2_G_D_1_P_0"

                                      android:strokeColor="#000" android:strokeLineCap="round"

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

                                      android:strokeAlpha="1" android:trimPathStart="0.14"

                                      android:trimPathEnd="0.89" android:trimPathOffset="0"

                                      android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -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.97,-31.67 27.97,-31.67 "/>

                            </group>

                        </group>

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

                       android:translateY="11.992999999999999" android:pivotX="14.333"

                       android:pivotY="13" android:scaleX="0" android:scaleY="0">

                    <path android:name="_R_G_L_2_G_D_0_P_0" android:strokeColor="#ffffff"

                          android:strokeLineCap="round" android:strokeLineJoin="round"

                          android:strokeWidth="2" android:strokeAlpha="1"

                          android:pathData=" M22.33 21 C22.33,21 6.33,21 6.33,21 C5.6,21 5,20.4 5,19.67 C5,19.67 5,6.33 5,6.33 C5,5.6 5.6,5 6.33,5 C6.33,5 22.33,5 22.33,5 C23.07,5 23.67,5.6 23.67,6.33 C23.67,6.33 23.67,19.67 23.67,19.67 C23.67,20.4 23.07,21 22.33,21c "/>

                </group>

                </group>

                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="16"

                       android:translateY="16" android:scaleX="1.3" android:scaleY="1.3">

                    <group android:name="_R_G_L_1_G" android:translateX="-8.25"

                           android:translateY="-4.25" android:pivotX="8.25" android:pivotY="7.25"

                           android:scaleX="0" android:scaleY="0">

                        <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#000"

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

                       android:translateY="11.992999999999999" android:pivotX="14.333"

                       android:pivotY="13" android:scaleX="0" android:scaleY="0">

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

                           android:translateY="10.257">

                        <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#ffffff"

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

                              android:pathData=" M2.75 0.25 C4.13,0.25 5.25,1.37 5.25,2.75 C5.25,4.13 4.13,5.25 2.75,5.25 C1.37,5.25 0.25,4.13 0.25,2.75 C0.25,1.37 1.37,0.25 2.75,0.25c "/>

                    </group>

                </group>

                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="16"

                       android:translateY="16" android:scaleX="1.3" android:scaleY="1.3">

                    <group android:name="_R_G_L_0_G" android:translateX="-2.25"

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

                           android:scaleX="0" android:scaleY="0">

                        <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000"

                              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 android:name="_R_G_L_0_G_N_4_T_0" android:translateX="1.6669999999999998"

                       android:translateY="11.992999999999999" android:pivotX="14.333"

                       android:pivotY="13" android:scaleX="0" android:scaleY="0">

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

                           android:translateY="3.172">

                        <group android:name="_R_G_L_0_G" android:translateX="-9.667"

                               android:translateY="-9.667">

                            <path android:name="_R_G_L_0_G_D_0_P_0" android:strokeColor="#ffffff"

                                  android:strokeLineCap="round" android:strokeLineJoin="round"

                                  android:strokeWidth="2" android:strokeAlpha="1"

                                  android:trimPathStart="0.14" android:trimPathEnd="0.89"

                                  android:trimPathOffset="0"

                                  android:pathData=" M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 "/>

                        </group>

                    </group>

                </group>

            </group>

            <group android:name="time_group"/>

        </vector>

    </aapt:attr>

    <target android:name="_R_G_L_2_G_D_0_P_0">

    <target android:name="_R_G_L_2_G">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="trimPathStart" android:duration="50"

                                android:startOffset="0" android:valueFrom="0.14"

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

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

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

                                android:valueType="floatType">

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

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

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="trimPathStart" android:duration="67"

                                android:startOffset="50" android:valueFrom="0.14"

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

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

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

                                android:valueType="floatType">

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

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

                    </aapt:attr>

                </objectAnimator>

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

                                android:startOffset="233" android:valueFrom="1.02"

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

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

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

                    </aapt:attr>

                </objectAnimator>

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

                                android:startOffset="233" android:valueFrom="1.02"

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

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

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

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_2_G_D_0_P_0">

    <target android:name="_R_G_L_1_G_N_4_T_0">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="trimPathEnd" android:duration="50"

                                android:startOffset="0" android:valueFrom="0.89"

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

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

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

                                android:valueType="floatType">

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

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

                    </aapt:attr>

                </objectAnimator>

                <objectAnimator android:propertyName="trimPathEnd" android:duration="67"

                                android:startOffset="50" android:valueFrom="0.89"

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

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

                                android:valueType="floatType">

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

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

                    </aapt:attr>

                </objectAnimator>

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

                                android:startOffset="233" android:valueFrom="1.02"

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

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

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

                    </aapt:attr>

                </objectAnimator>

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

                                android:startOffset="233" android:valueFrom="1.02"

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

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

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

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_2_G_D_1_P_0">

    <target android:name="_R_G_L_0_G_D_0_P_0">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="trimPathStart" android:duration="50"
@@ -133,7 +146,7 @@ 
            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_2_G_D_1_P_0">

    <target android:name="_R_G_L_0_G_D_0_P_0">

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

            <set android:ordering="together">

                <objectAnimator android:propertyName="trimPathEnd" android:duration="50"
@@ -155,130 +168,48 @@ 
            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_2_G_T_1">

    <target android:name="_R_G_L_0_G_T_1">

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

            <set android:ordering="together">

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

                                android:startOffset="0" android:propertyXName="translateX"

                                android:propertyYName="translateY"

                                android:pathData="M 2.25,2.373C 2.25,1.2001604776382402 2.25,-3.49116047763824 2.25,-4.664">

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

                                android:startOffset="0" android:valueFrom="3.172"

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

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

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

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.23,-0.46 0.2,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_2_G_N_2_T_0">

    <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="233"

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

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

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

                                android:valueType="floatType">

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

                        <pathInterpolator

                            android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0"/>

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

                    </aapt:attr>

                </objectAnimator>

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

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

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

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

                                android:valueType="floatType">

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

                        <pathInterpolator

                            android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

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

                                android:startOffset="233" android:valueFrom="1.0125"

                                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="117"

                                android:startOffset="233" android:valueFrom="1.0125"

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

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

            <set android:ordering="together">

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

                                android:startOffset="50" android:valueFrom="0" android:valueTo="1.3"

                                android:valueType="floatType"/>

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

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

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

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

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

                    </aapt:attr>

                </objectAnimator>

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

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

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

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

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

                    </aapt:attr>

                </objectAnimator>

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

                                android:startOffset="233" android:valueFrom="1.025"

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

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

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

                    </aapt:attr>

                </objectAnimator>

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

                                android:startOffset="233" android:valueFrom="1.025"

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

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

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

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G">

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

            <set android:ordering="together">

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

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

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

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

                        <pathInterpolator

                            android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0"/>

                    </aapt:attr>

                </objectAnimator>

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

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

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

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

                        <pathInterpolator

                            android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0"/>

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

                    </aapt:attr>

                </objectAnimator>

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

                                android:startOffset="233" android:valueFrom="1.0125"

                                android:startOffset="233" android:valueFrom="1.02"

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

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

                    </aapt:attr>

                </objectAnimator>

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

                                android:startOffset="233" android:valueFrom="1.0125"

                                android:startOffset="233" android:valueFrom="1.02"

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

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

                    </aapt:attr>

                </objectAnimator>

            </set>

core/res/res/anim/lock_lock.xml

100755 → 100644
+205 −174

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

core/res/res/anim/lock_out.xml

deleted100755 → 0
+0 −277

File deleted.

Preview size limit exceeded, changes collapsed.

core/res/res/anim/lock_scanning.xml

+142 −159

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/anim/lock_to_error.xml

100755 → 100644
+52 −57

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.