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

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

Merge "Move padlock to the top of the lock screen" into qt-dev 

am: 733379cc

Change-Id: Ia56effb294fe4bdd28b5269a790ebd35eb6e1f55
parents eb70e381 733379cc

core/res/res/anim/lock_in.xml

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
                                      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="?attr/textColor" android:strokeLineCap="round"

                                      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"
@@ -48,7 +48,7 @@ 
                    <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="?attr/textColor"

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

                              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>
@@ -58,7 +58,7 @@ 
                    <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="?attr/textColor"

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

core/res/res/anim/lock_lock.xml

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
                           android:translateY="3">

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

                               android:translateY="-7.25">

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

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

                                  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>
@@ -40,7 +40,7 @@ 
                            <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"

                                <path android:name="_R_G_L_1_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>
@@ -61,7 +61,7 @@ 
                                      android:fillAlpha="0" android:fillType="nonZero"

                                      android:pathData=" M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 "/>

                                <path android:name="_R_G_L_0_G_D_1_P_0"

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

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

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

                                      android:strokeAlpha="1"

                                      android:pathData=" M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 "/>

core/res/res/anim/lock_scanning.xml

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
                        <group android:name="_R_G_L_2_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_2_G_D_0_P_0" android:fillColor="?attr/textColor"

                            <path android:name="_R_G_L_2_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>
@@ -45,7 +45,7 @@ 
                               android:scaleY="0.125">

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

                                <path android:name="_R_G_L_1_G_D_0_P_0"

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

                                      android:strokeColor="#000" 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 "/>
@@ -62,7 +62,7 @@ 
                        <group android:name="_R_G_L_0_G" android:translateY="0.04699999999999971"

                               android:pivotX="8.25" android:pivotY="7.25" android:scaleX="1.01562"

                               android:scaleY="1.01563">

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

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

                                  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>

core/res/res/anim/lock_to_error.xml

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
                    <group android:name="_R_G_L_2_G" android:translateX="6"

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

                           android:scaleX="0.98462" android:scaleY="0.98462">

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

                        <path android:name="_R_G_L_2_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>
@@ -38,7 +38,7 @@ 
                    <group android:name="_R_G_L_1_G" android:translateX="-16.273"

                           android:translateY="32.312" android:pivotX="27.965" android:pivotY="-32"

                           android:scaleX="0.12308" android:scaleY="0.12308">

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

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

                              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 "/>
@@ -48,7 +48,7 @@ 
                       android:translateY="12.649999999999999" android:pivotX="8.25"

                       android:pivotY="7.25" android:rotation="0" android:scaleX="1.3"

                       android:scaleY="1.3">

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

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

                          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>

core/res/res/anim/lock_unlock.xml

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
                    <group android:name="_R_G_L_2_G_T_1" android:translateY="3">

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

                               android:translateY="-7.25">

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

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

                                  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>
@@ -38,7 +38,7 @@ 
                            <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"

                                <path android:name="_R_G_L_1_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>
@@ -58,7 +58,7 @@ 
                                      android:fillAlpha="0" android:fillType="nonZero"

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

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

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

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

                                      android:strokeAlpha="1"

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