Merge cherrypicks of ['googleplex-android-review.googlesource.com/23793397',... (64e91ffc) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -229,6 +229,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		private RemoteAnimationProvider mRemoteAnimationProvider;
		// Strong refs to runners which are cleared when the launcher activity is destroyed
		private RemoteAnimationFactory mWallpaperOpenRunner;
		private RemoteAnimationFactory mAppLaunchRunner;
		private RemoteAnimationFactory mKeyguardGoingAwayRunner;

		private RemoteAnimationFactory mWallpaperOpenTransitionRunner;
		@@ -298,17 +299,17 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
		RunnableList onEndCallback = new RunnableList();

		RemoteAnimationFactory delegateRunner = new AppLaunchAnimationRunner(v, onEndCallback);
		mAppLaunchRunner = new AppLaunchAnimationRunner(v, onEndCallback);
		ItemInfo tag = (ItemInfo) v.getTag();
		if (tag != null && tag.shouldUseBackgroundAnimation()) {
		ContainerAnimationRunner containerAnimationRunner =
		ContainerAnimationRunner.from(v, mStartingWindowListener, onEndCallback);
		if (containerAnimationRunner != null) {
		delegateRunner = containerAnimationRunner;
		mAppLaunchRunner = containerAnimationRunner;
		}
		}
		RemoteAnimationRunnerCompat runner = new LauncherAnimationRunner(
		mHandler, delegateRunner, true /* startAtFrontOfQueue */);
		mHandler, mAppLaunchRunner, true /* startAtFrontOfQueue */);

		// Note that this duration is a guess as we do not know if the animation will be a
		// recents launch or not for sure until we know the opening app targets.
		@@ -1164,6 +1165,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		// Also clear strong references to the runners registered with the remote animation
		// definition so we don't have to wait for the system gc
		mWallpaperOpenRunner = null;
		mAppLaunchRunner = null;
		mKeyguardGoingAwayRunner = null;
		}
		}

quickstep/src/com/android/quickstep/TaskViewUtils.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -473,16 +473,14 @@ public final class TaskViewUtils {
		throw new IllegalStateException(
		"Expected task to be showing, but it is " + mode);
		}
		if (change.getParent() == null) {
		throw new IllegalStateException("Initiating multi-split launch but the split"
		+ "root of " + taskId + " is already visible or has broken hierarchy.");
		}
		}
		if (taskId == initialTaskId) {
		splitRoot1 = transitionInfo.getChange(change.getParent());
		splitRoot1 = change.getParent() == null ? change :
		transitionInfo.getChange(change.getParent());
		}
		if (taskId == secondTaskId) {
		splitRoot2 = transitionInfo.getChange(change.getParent());
		splitRoot2 = change.getParent() == null ? change :
		transitionInfo.getChange(change.getParent());
		}
		}