Merge "Clean up RemoteTargetHandles when RecentsAnimation ends" into sc-v2-dev (6e5f4e31) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -1736,7 +1736,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		endLauncherTransitionController();
		mRecentsView.onSwipeUpAnimationSuccess();
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		mTaskAnimationManager.setLiveTileCleanUpHandler(mInputConsumerProxy::destroy);
		mTaskAnimationManager.setLiveTileCleanUpHandler(() -> {
		mRecentsView.cleanupRemoteTargets();
		mInputConsumerProxy.destroy();
		});
		mTaskAnimationManager.enableLiveTileRestartListener();
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -4390,7 +4390,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		public void finishRecentsAnimation(boolean toRecents, boolean shouldPip,
		Runnable onFinishComplete) {
		// TODO(b/197232424#comment#10) Move this back into onRecentsAnimationComplete(). Maybe?
		mRemoteTargetHandles = null;
		cleanupRemoteTargets();
		if (!toRecents && ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		// Reset the minimized state since we force-toggled the minimized state when entering
		// overview, but never actually finished the recents animation. This is a catch all for
		@@ -4849,6 +4849,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		&& mCurrentGestureEndTarget != GestureState.GestureEndTarget.RECENTS;
		}

		public void cleanupRemoteTargets() {
		mRemoteTargetHandles = null;
		}

		/**
		* Used to register callbacks for when our empty message state changes.
		*