Merge "New unlock animations" into qt-r1-dev (1b4e8d2f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/anim/lock_unlock.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="333"
		android:duration="183"
		android:propertyName="pathData"
		android:startOffset="67"
		android:valueFrom="M14.33 14.33 C14.33,14.33 14.29,6.17 14.29,6.17 C14.29,3.59 12.2,1.5 9.63,1.5 C7.05,1.5 4.96,3.59 4.96,6.17 C4.96,6.17 4.96,7.33 4.96,7.33 "
		@@ -286,7 +286,7 @@
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="717"
		android:duration="983"
		android:propertyName="translateX"
		android:startOffset="0"
		android:valueFrom="0"

packages/SystemUI/res/anim/lock_unlock_circular.xml

+151 −237

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<animated-vector xmlns:aapt="http://schemas.android.com/aapt"
		xmlns:android="http://schemas.android.com/apk/res/android" >
		<!-- 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="42dp"
		android:viewportHeight="42"
		android:viewportWidth="32"
		android:width="32dp" >
		<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_T_1"
		android:translateX="15.999"
		<group android:name="_R_G_L_2_G_T_1" android:translateX="15.999"
		android:translateY="24.333">
		<group
		android:name="_R_G_L_2_G"
		android:translateX="-9.583"
		<group android:name="_R_G_L_2_G" android:translateX="-9.583"
		android:translateY="-8.916">
		<path
		android:name="_R_G_L_2_G_D_0_P_0"
		android:fillAlpha="1"
		android:fillColor="#ffffff"
		android:fillType="nonZero"
		<path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#ffffff"
		android:fillAlpha="1" android:fillType="nonZero"
		android:pathData=" M17.42 1.75 C17.42,1.75 17.42,14.58 17.42,14.58 C17.42,15.41 16.74,16.08 15.92,16.08 C15.92,16.08 3.25,16.08 3.25,16.08 C2.42,16.08 1.75,15.41 1.75,14.58 C1.75,14.58 1.75,1.75 1.75,1.75 C1.75,1.75 17.42,1.75 17.42,1.75c M18.92 0.25 C18.92,0.25 0.25,0.25 0.25,0.25 C0.25,0.25 0.25,14.58 0.25,14.58 C0.25,16.24 1.59,17.58 3.25,17.58 C3.25,17.58 15.92,17.58 15.92,17.58 C17.57,17.58 18.92,16.24 18.92,14.58 C18.92,14.58 18.92,0.25 18.92,0.25c "/>
		</group>
		</group>
		<group
		android:name="_R_G_L_1_G_N_3_T_1"
		android:translateX="15.999"
		<group android:name="_R_G_L_1_G_N_3_T_1" android:translateX="15.999"
		android:translateY="24.333">
		<group
		android:name="_R_G_L_1_G_N_3_T_0"
		android:translateX="-9.583"
		<group android:name="_R_G_L_1_G_N_3_T_0" android:translateX="-9.583"
		android:translateY="-8.916">
		<group
		android:name="_R_G_L_1_G"
		android:pivotX="2.25"
		android:pivotY="3.334"
		android:scaleX="1"
		android:scaleY="1"
		android:translateX="7.334"
		android:translateY="5.333" >
		<path
		android:name="_R_G_L_1_G_D_0_P_0"
		android:fillAlpha="1"
		android:fillColor="#ffffff"
		android:fillType="nonZero"
		<group android:name="_R_G_L_1_G" android:translateX="7.334"
		android:translateY="5.333" android:pivotX="2.25"
		android:pivotY="3.334" android:scaleX="1" android:scaleY="1">
		<path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#ffffff"
		android:fillAlpha="1" android:fillType="nonZero"
		android:pathData=" M4.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.25 C3.35,0.25 4.25,1.15 4.25,2.25c "/>
		<path
		android:name="_R_G_L_1_G_D_1_P_0"
		android:pathData=" M2.25 2.25 C2.25,2.25 2.25,5.92 2.25,5.92 "
		android:strokeAlpha="1"
		android:strokeColor="#ffffff"
		android:strokeLineCap="round"
		android:strokeLineJoin="round"
		android:strokeWidth="1.5" />
		<path android:name="_R_G_L_1_G_D_1_P_0" android:strokeColor="#ffffff"
		android:strokeLineCap="round" android:strokeLineJoin="round"
		android:strokeWidth="1.5" android:strokeAlpha="1"
		android:pathData=" M2.25 2.25 C2.25,2.25 2.25,5.92 2.25,5.92 "/>
		</group>
		</group>
		</group>
		<group
		android:name="_R_G_L_0_G_N_3_T_1"
		android:translateX="15.999"
		<group android:name="_R_G_L_0_G_N_3_T_1" android:translateX="15.999"
		android:translateY="24.333">
		<group
		android:name="_R_G_L_0_G_N_3_T_0"
		android:translateX="-9.583"
		<group android:name="_R_G_L_0_G_N_3_T_0" android:translateX="-9.583"
		android:translateY="-8.916">
		<group
		android:name="_R_G_L_0_G"
		android:translateX="1.5"
		<group android:name="_R_G_L_0_G" android:translateX="1.5"
		android:translateY="-11.835">
		<path
		android:name="_R_G_L_0_G_D_0_P_0"
		android:pathData=" M12.42 12.6 C12.42,12.6 12.42,8.17 12.42,8.17 C12.42,5.83 10.48,3.75 8.08,3.75 C5.69,3.75 3.75,5.83 3.75,8.17 C3.75,8.17 3.75,12.6 3.75,12.6 "
		android:strokeAlpha="1"
		android:strokeColor="#ffffff"
		android:strokeLineCap="round"
		android:strokeLineJoin="round"
		android:strokeWidth="1.5" />
		<path android:name="_R_G_L_0_G_D_0_P_0" android:strokeColor="#ffffff"
		android:strokeLineCap="round" android:strokeLineJoin="round"
		android:strokeWidth="1.5" android:strokeAlpha="1"
		android:pathData=" M12.42 12.6 C12.42,12.6 12.42,8.17 12.42,8.17 C12.42,5.83 10.48,3.75 8.08,3.75 C5.69,3.75 3.75,5.83 3.75,8.17 C3.75,8.17 3.75,12.6 3.75,12.6 "/>
		</group>
		</group>
		</group>
		@@ -85,39 +61,26 @@
		<group android:name="time_group"/>
		</vector>
		</aapt:attr>

		<target android:name="_R_G_L_2_G_T_1">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="133"
		android:propertyName="translateY"
		android:startOffset="0"
		android:valueFrom="24.333"
		android:valueTo="22.458"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="translateY" android:duration="133"
		android:startOffset="0" android:valueFrom="24.333"
		android:valueTo="22.458" android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.705,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="133"
		android:propertyName="translateY"
		android:startOffset="133"
		android:valueFrom="22.458"
		android:valueTo="25.333"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="translateY" android:duration="133"
		android:startOffset="133" android:valueFrom="22.458"
		android:valueTo="25.333" android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.289,0 0.724,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="100"
		android:propertyName="translateY"
		android:startOffset="267"
		android:valueFrom="25.333"
		android:valueTo="24.333"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="translateY" android:duration="100"
		android:startOffset="267" android:valueFrom="25.333"
		android:valueTo="24.333" android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.624,1 1.0,1.0"/>
		</aapt:attr>
		@@ -128,46 +91,30 @@
		<target android:name="_R_G_L_1_G">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="100"
		android:propertyName="scaleX"
		android:startOffset="0"
		android:valueFrom="1"
		android:valueTo="0.9"
		<objectAnimator android:propertyName="scaleX" android:duration="100"
		android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
		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:duration="100"
		android:propertyName="scaleY"
		android:startOffset="0"
		android:valueFrom="1"
		android:valueTo="0.9"
		<objectAnimator android:propertyName="scaleY" android:duration="100"
		android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
		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:duration="283"
		android:propertyName="scaleX"
		android:startOffset="100"
		android:valueFrom="0.9"
		android:valueTo="1"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="scaleX" android:duration="283"
		android:startOffset="100" android:valueFrom="0.9"
		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:duration="283"
		android:propertyName="scaleY"
		android:startOffset="100"
		android:valueFrom="0.9"
		android:valueTo="1"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="scaleY" android:duration="283"
		android:startOffset="100" android:valueFrom="0.9"
		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>
		@@ -178,35 +125,23 @@
		<target android:name="_R_G_L_1_G_N_3_T_1">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="133"
		android:propertyName="translateY"
		android:startOffset="0"
		android:valueFrom="24.333"
		android:valueTo="22.458"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="translateY" android:duration="133"
		android:startOffset="0" android:valueFrom="24.333"
		android:valueTo="22.458" android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.705,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="133"
		android:propertyName="translateY"
		android:startOffset="133"
		android:valueFrom="22.458"
		android:valueTo="25.333"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="translateY" android:duration="133"
		android:startOffset="133" android:valueFrom="22.458"
		android:valueTo="25.333" android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.289,0 0.724,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="100"
		android:propertyName="translateY"
		android:startOffset="267"
		android:valueFrom="25.333"
		android:valueTo="24.333"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="translateY" android:duration="100"
		android:startOffset="267" android:valueFrom="25.333"
		android:valueTo="24.333" android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.624,1 1.0,1.0"/>
		</aapt:attr>
		@@ -217,9 +152,7 @@
		<target android:name="_R_G_L_0_G_D_0_P_0">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="67"
		android:propertyName="pathData"
		<objectAnimator android:propertyName="pathData" android:duration="67"
		android:startOffset="0"
		android:valueFrom="M12.42 12.6 C12.42,12.6 12.42,8.17 12.42,8.17 C12.42,5.83 10.48,3.75 8.08,3.75 C5.69,3.75 3.75,5.83 3.75,8.17 C3.75,8.17 3.75,12.6 3.75,12.6 "
		android:valueTo="M12.42 12.6 C12.42,12.6 12.4,5.86 12.4,5.86 C12.4,3.52 10.46,1.44 8.06,1.44 C5.67,1.44 3.73,3.52 3.73,5.86 C3.73,5.86 3.75,7.41 3.75,7.41 "
		@@ -228,9 +161,7 @@
		<pathInterpolator android:pathData="M 0.0,0.0 c0.59,0 0.488,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="333"
		android:propertyName="pathData"
		<objectAnimator android:propertyName="pathData" android:duration="183"
		android:startOffset="67"
		android:valueFrom="M12.42 12.6 C12.42,12.6 12.4,5.86 12.4,5.86 C12.4,3.52 10.46,1.44 8.06,1.44 C5.67,1.44 3.73,3.52 3.73,5.86 C3.73,5.86 3.75,7.41 3.75,7.41 "
		android:valueTo="M12.42 12.6 C12.42,12.6 12.41,8.16 12.41,8.16 C12.41,5.81 14.36,3.75 16.75,3.77 C19.15,3.78 21.07,5.71 21.07,8.05 C21.07,8.05 21.08,8.22 21.08,8.22 "
		@@ -245,35 +176,23 @@
		<target android:name="_R_G_L_0_G_N_3_T_1">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="133"
		android:propertyName="translateY"
		android:startOffset="0"
		android:valueFrom="24.333"
		android:valueTo="22.458"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="translateY" android:duration="133"
		android:startOffset="0" android:valueFrom="24.333"
		android:valueTo="22.458" android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.705,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="133"
		android:propertyName="translateY"
		android:startOffset="133"
		android:valueFrom="22.458"
		android:valueTo="25.333"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="translateY" android:duration="133"
		android:startOffset="133" android:valueFrom="22.458"
		android:valueTo="25.333" android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.289,0 0.724,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="100"
		android:propertyName="translateY"
		android:startOffset="267"
		android:valueFrom="25.333"
		android:valueTo="24.333"
		android:valueType="floatType" >
		<objectAnimator android:propertyName="translateY" android:duration="100"
		android:startOffset="267" android:valueFrom="25.333"
		android:valueTo="24.333" android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.624,1 1.0,1.0"/>
		</aapt:attr>
		@@ -284,15 +203,10 @@
		<target android:name="time_group">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="717"
		android:propertyName="translateX"
		android:startOffset="0"
		android:valueFrom="0"
		android:valueTo="1"
		<objectAnimator android:propertyName="translateX" android:duration="717"
		android:startOffset="0" android:valueFrom="0" android:valueTo="1"
		android:valueType="floatType"/>
		</set>
		</aapt:attr>
		</target>

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