Merge "Lockscreen launch animations" into lmp-dev (72eb2ae2) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerNative.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1942,9 +1942,9 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		return true;
		}

		case DISMISS_KEYGUARD_ON_NEXT_ACTIVITY_TRANSACTION: {
		case KEYGUARD_WAITING_FOR_ACTIVITY_DRAWN_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		dismissKeyguardOnNextActivity();
		keyguardWaitingForActivityDrawn();
		reply.writeNoException();
		return true;
		}
		@@ -4738,11 +4738,11 @@ class ActivityManagerProxy implements IActivityManager
		reply.recycle();
		}

		public void dismissKeyguardOnNextActivity() throws RemoteException {
		public void keyguardWaitingForActivityDrawn() throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		mRemote.transact(DISMISS_KEYGUARD_ON_NEXT_ACTIVITY_TRANSACTION, data, reply, 0);
		mRemote.transact(KEYGUARD_WAITING_FOR_ACTIVITY_DRAWN_TRANSACTION, data, reply, 0);
		reply.readException();
		data.recycle();
		reply.recycle();

core/java/android/app/IActivityManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -383,7 +383,7 @@ public interface IActivityManager extends IInterface {

		public void showBootMessage(CharSequence msg, boolean always) throws RemoteException;

		public void dismissKeyguardOnNextActivity() throws RemoteException;
		public void keyguardWaitingForActivityDrawn() throws RemoteException;

		public boolean targetTaskAffinityMatchesActivity(IBinder token, String destAffinity)
		throws RemoteException;
		@@ -688,7 +688,6 @@ public interface IActivityManager extends IInterface {
		int UPDATE_PERSISTENT_CONFIGURATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+135;
		int GET_PROCESS_PSS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+136;
		int SHOW_BOOT_MESSAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+137;
		int DISMISS_KEYGUARD_ON_NEXT_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+138;
		int KILL_ALL_BACKGROUND_PROCESSES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+139;
		int GET_CONTENT_PROVIDER_EXTERNAL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+140;
		int REMOVE_CONTENT_PROVIDER_EXTERNAL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+141;
		@@ -760,4 +759,5 @@ public interface IActivityManager extends IInterface {
		int NOTIFY_LAUNCH_TASK_BEHIND_COMPLETE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+228;
		int START_ACTIVITY_FROM_RECENTS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 229;
		int NOTIFY_ENTER_ANIMATION_COMPLETE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+230;
		int KEYGUARD_WAITING_FOR_ACTIVITY_DRAWN_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+231;
		}

core/java/android/view/WindowManagerPolicy.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1013,6 +1013,11 @@ public interface WindowManagerPolicy {
		*/
		public void dismissKeyguardLw();

		/**
		* Notifies the keyguard that the activity has drawn it was waiting for.
		*/
		public void notifyActivityDrawnForKeyguardLw();

		/**
		* Ask the policy whether the Keyguard has drawn. If the Keyguard is disabled, this method
		* returns true as soon as we know that Keyguard is disabled.

core/java/com/android/internal/policy/IKeyguardService.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -65,4 +65,10 @@ interface IKeyguardService {
		* @param fadeoutDuration the duration of the exit animation, in milliseconds
		*/
		oneway void startKeyguardExitAnimation(long startTime, long fadeoutDuration);

		/**
		* Notifies the Keyguard that the activity that was starting has now been drawn and it's safe
		* to start the keyguard dismiss sequence.
		*/
		oneway void onActivityDrawn();
		}

core/res/res/anim/wallpaper_close_enter.xml

+12 −10

Original line number	Diff line number	Diff line
		@@ -18,15 +18,17 @@
		-->

		<set xmlns:android="http://schemas.android.com/apk/res/android"
		android:shareInterpolator="false" android:zAdjustment="top">
		<scale android:fromXScale=".2" android:toXScale="1.0"
		android:fromYScale=".2" android:toYScale="1.0"
		android:pivotX="50%p" android:pivotY="50%p"
		android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
		android:interpolator="@interpolator/decelerate_cubic"
		android:duration="300" />
		android:background="#ff000000" android:shareInterpolator="false" android:zAdjustment="top">

		<alpha android:fromAlpha="0" android:toAlpha="1.0"
		android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
		android:interpolator="@interpolator/decelerate_cubic"
		android:duration="300"/>
		android:interpolator="@interpolator/decelerate_quart"
		android:startOffset="300"
		android:duration="167"/>

		<translate android:fromYDelta="110%" android:toYDelta="0"
		android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
		android:interpolator="@interpolator/decelerate_quint"
		android:startOffset="300"
		android:duration="417" />
		</set>
		No newline at end of file