Merge "Revert "Use new onStartSplitLegacy when starting split from overview"" into tm-dev (8340cb6d) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,8 @@ public class RecentsAnimationCallbacks implements
		.map(RemoteAnimationTargetCompat::unwrap)
		.toArray(RemoteAnimationTarget[]::new);

		RemoteAnimationTarget[] nonAppTargets = mSystemUiProxy.onGoingToRecentsLegacy(nonHomeApps);
		RemoteAnimationTarget[] nonAppTargets =
		mSystemUiProxy.onGoingToRecentsLegacy(mCancelled, nonHomeApps);

		RecentsAnimationTargets targets = new RecentsAnimationTargets(appTargets,
		wallpaperTargets, RemoteAnimationTargetCompat.wrap(nonAppTargets),

+4 −13

Original line number	Diff line number	Diff line
		@@ -676,12 +676,14 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
		* Call this when going to recents so that shell can set-up and provide appropriate leashes
		* for animation (eg. DividerBar).
		*
		* @param cancel true if recents starting is being cancelled.
		* @return RemoteAnimationTargets of windows that need to animate but only exist in shell.
		*/
		public RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) {
		public RemoteAnimationTarget[] onGoingToRecentsLegacy(boolean cancel,
		RemoteAnimationTarget[] apps) {
		if (mSplitScreen != null) {
		try {
		return mSplitScreen.onGoingToRecentsLegacy(apps);
		return mSplitScreen.onGoingToRecentsLegacy(cancel, apps);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call onGoingToRecentsLegacy");
		}
		@@ -689,17 +691,6 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI
		return null;
		}

		public RemoteAnimationTarget[] onStartingSplitLegacy(RemoteAnimationTarget[] apps) {
		if (mSplitScreen != null) {
		try {
		return mSplitScreen.onStartingSplitLegacy(apps);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call onStartingSplitLegacy");
		}
		}
		return null;
		}

		//
		// One handed
		//

+2 −3

Original line number	Diff line number	Diff line
		@@ -177,9 +177,8 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
		((RecentsActivity) activityInterface.getCreatedActivity()).startHome();
		return;
		}

		RemoteAnimationTarget[] nonAppTargets =
		SystemUiProxy.INSTANCE.getNoCreate().onStartingSplitLegacy(nonHomeApps);
		RemoteAnimationTarget[] nonAppTargets = SystemUiProxy.INSTANCE.get(mCtx)
		.onGoingToRecentsLegacy(false, nonHomeApps);

		if (ENABLE_QUICKSTEP_LIVE_TILE.get() && activityInterface.isInLiveTileMode()
		&& activityInterface.getCreatedActivity() != null) {