Merge "Update lockscreen animations for all themes." into qt-r1-dev (8acf8812) · Commits · e / os / android_frameworks_base

core/res/res/values/symbols.xml

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -2271,11 +2271,6 @@
	<java-symbol type="anim" name="lock_screen_wallpaper_exit" />		<java-symbol type="anim" name="lock_screen_wallpaper_exit" />
	<java-symbol type="anim" name="launch_task_behind_source" />		<java-symbol type="anim" name="launch_task_behind_source" />
	<java-symbol type="anim" name="wallpaper_open_exit" />		<java-symbol type="anim" name="wallpaper_open_exit" />
	<java-symbol type="anim" name="lock_to_error" />
	<java-symbol type="anim" name="lock_lock" />
	<java-symbol type="anim" name="lock_unlock" />
	<java-symbol type="anim" name="lock_in" />
	<java-symbol type="anim" name="lock_scanning" />

	<java-symbol type="bool" name="config_alwaysUseCdmaRssi" />		<java-symbol type="bool" name="config_alwaysUseCdmaRssi" />
	<java-symbol type="dimen" name="status_bar_icon_size" />		<java-symbol type="dimen" name="status_bar_icon_size" />

core/res/res/anim/lock_in.xml→packages/SystemUI/res/anim/lock_in.xml

+0 −0

File moved.

View file

packages/SystemUI/res/anim/lock_in_circular.xml

0 → 100644

+327 −0

Original line number	Original line	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" >

			<aapt:attr name="android:drawable" >
			<vector
			android:height="32dp"
			android:viewportHeight="32"
			android:viewportWidth="32"
			android:width="32dp" >
			<group android:name="_R_G" >
			<group
			android:name="_R_G_L_2_G"
			android:pivotX="9.583"
			android:pivotY="8.916"
			android:scaleX="0"
			android:scaleY="0"
			android:translateX="6.416"
			android:translateY="10.416999999999998" >
			<path
			android:name="_R_G_L_2_G_D_0_P_0"
			android:fillAlpha="1"
			android:fillColor="#ffffff"
			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
			android:name="_R_G_L_1_G_N_3_T_0"
			android:pivotX="9.583"
			android:pivotY="8.916"
			android:scaleX="0"
			android:scaleY="0"
			android:translateX="6.416"
			android:translateY="10.416999999999998" >
			<group
			android:name="_R_G_L_1_G"
			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"
			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" />
			</group>
			</group>
			<group
			android:name="_R_G_L_0_G_N_3_T_0"
			android:pivotX="9.583"
			android:pivotY="8.916"
			android:scaleX="0"
			android:scaleY="0"
			android:translateX="6.416"
			android:translateY="10.416999999999998" >
			<group
			android:name="_R_G_L_0_G_T_1"
			android:translateX="9.583"
			android:translateY="-0.861" >
			<group
			android:name="_R_G_L_0_G"
			android:translateX="-8.083"
			android:translateY="-8.173" >
			<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"
			android:trimPathEnd="0.9"
			android:trimPathOffset="0"
			android:trimPathStart="0.15" />
			</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:duration="233"
			android:propertyName="scaleX"
			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.043,0.277 0.44,1 1.0,1.0" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="233"
			android:propertyName="scaleY"
			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.043,0.277 0.44,1 1.0,1.0" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="117"
			android:propertyName="scaleX"
			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.333,0 0.667,1 1.0,1.0" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="117"
			android:propertyName="scaleY"
			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.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_3_T_0" >
			<aapt:attr name="android:animation" >
			<set android:ordering="together" >
			<objectAnimator
			android:duration="233"
			android:propertyName="scaleX"
			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.043,0.277 0.44,1 1.0,1.0" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="233"
			android:propertyName="scaleY"
			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.043,0.277 0.44,1 1.0,1.0" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="117"
			android:propertyName="scaleX"
			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.333,0 0.667,1 1.0,1.0" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="117"
			android:propertyName="scaleY"
			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.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:duration="50"
			android:propertyName="trimPathStart"
			android:startOffset="0"
			android:valueFrom="0.15"
			android:valueTo="0.15"
			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" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="67"
			android:propertyName="trimPathStart"
			android:startOffset="50"
			android:valueFrom="0.15"
			android:valueTo="0"
			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" />
			</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:duration="50"
			android:propertyName="trimPathEnd"
			android:startOffset="0"
			android:valueFrom="0.9"
			android:valueTo="0.9"
			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" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="67"
			android:propertyName="trimPathEnd"
			android:startOffset="50"
			android:valueFrom="0.9"
			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" />
			</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:duration="150"
			android:pathData="M 9.583,-0.861C 9.583,-1.32784640645981 9.583,-3.19515359354019 9.583,-3.662"
			android:propertyName="translateXY"
			android:propertyXName="translateX"
			android:propertyYName="translateY"
			android:startOffset="0" >
			<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_3_T_0" >
			<aapt:attr name="android:animation" >
			<set android:ordering="together" >
			<objectAnimator
			android:duration="233"
			android:propertyName="scaleX"
			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.043,0.277 0.44,1 1.0,1.0" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="233"
			android:propertyName="scaleY"
			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.043,0.277 0.44,1 1.0,1.0" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="117"
			android:propertyName="scaleX"
			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.333,0 0.667,1 1.0,1.0" />
			</aapt:attr>
			</objectAnimator>
			<objectAnimator
			android:duration="117"
			android:propertyName="scaleY"
			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.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:duration="717"
			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/anim/lock_in_filled.xml

0 → 100644

+190 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/anim/lock_in_rounded.xml

0 → 100644

+336 −0

File added.

Preview size limit exceeded, changes collapsed.