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

Commit 5fa07c09 authored Apr 03, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Apr 03, 2018

Merge changes from topic "fw_quickstep_update" into pi-dev

* changes:
  Reparent recents animation task leash to app animation layer
  Allow recents animation to override divider minimized state
  Prevent unnecessary reordering of the home stack

parents 1c3e76b1 d41f71d2

config/hiddenapi-vendor-list.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@ Landroid/app/AppOpsManager$PackageOps;->getOps()Ljava/util/List;
	Landroid/app/AppOpsManager$PackageOps;->getPackageName()Ljava/lang/String;		Landroid/app/AppOpsManager$PackageOps;->getPackageName()Ljava/lang/String;
	Landroid/app/AppOpsManager$PackageOps;->getUid()I		Landroid/app/AppOpsManager$PackageOps;->getUid()I
	Landroid/app/IActivityController$Stub;-><init>()V		Landroid/app/IActivityController$Stub;-><init>()V
	Landroid/app/IActivityManager;->cancelRecentsAnimation()V		Landroid/app/IActivityManager;->cancelRecentsAnimation(Z)V
	Landroid/app/IActivityManager;->cancelTaskWindowTransition(I)V		Landroid/app/IActivityManager;->cancelTaskWindowTransition(I)V
	Landroid/app/IActivityManager;->closeSystemDialogs(Ljava/lang/String;)V		Landroid/app/IActivityManager;->closeSystemDialogs(Ljava/lang/String;)V
	Landroid/app/IActivityManager;->getCurrentUser()Landroid/content/pm/UserInfo;		Landroid/app/IActivityManager;->getCurrentUser()Landroid/content/pm/UserInfo;

core/java/android/app/IActivityManager.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -450,7 +450,7 @@ interface IActivityManager {
	in Intent intent, in String resolvedType, in Bundle options, int userId);		in Intent intent, in String resolvedType, in Bundle options, int userId);
	void startRecentsActivity(in Intent intent, in IAssistDataReceiver assistDataReceiver,		void startRecentsActivity(in Intent intent, in IAssistDataReceiver assistDataReceiver,
	in IRecentsAnimationRunner recentsAnimationRunner);		in IRecentsAnimationRunner recentsAnimationRunner);
	void cancelRecentsAnimation();		void cancelRecentsAnimation(boolean restoreHomeStackPosition);
	int startActivityFromRecents(int taskId, in Bundle options);		int startActivityFromRecents(int taskId, in Bundle options);
	Bundle getActivityOptions(in IBinder token);		Bundle getActivityOptions(in IBinder token);
	List<IBinder> getAppTasks(in String callingPackage);		List<IBinder> getAppTasks(in String callingPackage);

core/java/android/view/IRecentsAnimationController.aidl

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -59,4 +59,9 @@ interface IRecentsAnimationController {
	* taken.		* taken.
	*/		*/
	void setAnimationTargetsBehindSystemBars(boolean behindSystemBars);		void setAnimationTargetsBehindSystemBars(boolean behindSystemBars);

			/**
			* Informs the system that the primary split-screen stack should be minimized.
			*/
			void setSplitScreenMinimized(boolean minimized);
	}		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -258,9 +258,9 @@ public class ActivityManagerWrapper {
	/**		/**
	* Cancels the remote recents animation started from {@link #startRecentsActivity}.		* Cancels the remote recents animation started from {@link #startRecentsActivity}.
	*/		*/
	public void cancelRecentsAnimation() {		public void cancelRecentsAnimation(boolean restoreHomeStackPosition) {
	try {		try {
	ActivityManager.getService().cancelRecentsAnimation();		ActivityManager.getService().cancelRecentsAnimation(restoreHomeStackPosition);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Failed to cancel recents animation", e);		Log.e(TAG, "Failed to cancel recents animation", e);
	}		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/RecentsAnimationControllerCompat.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -61,6 +61,14 @@ public class RecentsAnimationControllerCompat {
	}		}
	}		}

			public void setSplitScreenMinimized(boolean minimized) {
			try {
			mAnimationController.setSplitScreenMinimized(minimized);
			} catch (RemoteException e) {
			Log.e(TAG, "Failed to set minimize dock", e);
			}
			}

	public void finish(boolean toHome) {		public void finish(boolean toHome) {
	try {		try {
	mAnimationController.finish(toHome);		mAnimationController.finish(toHome);