Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev (eb0a38c5) · Commits · e / os / android_packages_apps_Trebuchet

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -384,10 +384,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		// Set up a entire animation lifecycle callback to notify the current recents view when
		// the animation is canceled
		mGestureState.runOnceAtState(STATE_RECENTS_ANIMATION_CANCELED, () -> {
		ThumbnailData snapshot = mGestureState.getRecentsAnimationCanceledSnapshot();
		ThumbnailData snapshot = mGestureState.consumeRecentsAnimationCanceledSnapshot();
		if (snapshot != null) {
		RecentsModel.INSTANCE.get(mContext).onTaskSnapshotChanged(
		mRecentsView.getRunningTaskId(), snapshot);
		mRecentsView.switchToScreenshot(snapshot,
		() -> mRecentsAnimationController.cleanupScreenshot());
		mRecentsView.onRecentsAnimationComplete();
		}
		});

+7 −4

Original line number	Diff line number	Diff line
		@@ -376,11 +376,14 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL
		}

		/**
		* Returns the canceled animation thumbnail data. This call only returns a value while
		* STATE_RECENTS_ANIMATION_CANCELED state is being set.
		* Returns and clears the canceled animation thumbnail data. This call only returns a value
		* while STATE_RECENTS_ANIMATION_CANCELED state is being set, and the caller is responsible for
		* calling {@link RecentsAnimationController#cleanupScreenshot()}.
		*/
		ThumbnailData getRecentsAnimationCanceledSnapshot() {
		return mRecentsAnimationCanceledSnapshot;
		ThumbnailData consumeRecentsAnimationCanceledSnapshot() {
		ThumbnailData data = mRecentsAnimationCanceledSnapshot;
		mRecentsAnimationCanceledSnapshot = null;
		return data;
		}

		void setSwipeUpStartTimeMs(long uptimeMs) {