Merge "Fix getting stuck in BackgroundAppState for 2-button mode" into ub-launcher3-qt-dev (72c6e7b7) · Commits · e / os / android_packages_apps_Trebuchet

go/quickstep/src/com/android/quickstep/GoActivityControlHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ public abstract class GoActivityControlHelper<T extends BaseDraggingActivity> im
		}

		@Override
		public void onSwipeUpComplete(T activity) {
		public void onSwipeUpToRecentsComplete(T activity) {
		// Go does not support swipe up gesture.
		}

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ public final class FallbackActivityControllerHelper implements
		}

		@Override
		public void onSwipeUpComplete(RecentsActivity activity) {
		public void onSwipeUpToRecentsComplete(RecentsActivity activity) {
		RecentsView recentsView = activity.getOverviewPanel();
		recentsView.getClearAllButton().setVisibilityAlpha(1);
		recentsView.setDisallowScrollToClearAll(false);

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe
		}

		@Override
		public void onSwipeUpComplete(Launcher activity) {
		public void onSwipeUpToRecentsComplete(Launcher activity) {
		// Re apply state in case we did something funky during the transition.
		activity.getStateManager().reapplyState();
		DiscoveryBounce.showForOverviewIfNeeded(activity);

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

+16 −14

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		\| STATE_LAUNCHER_DRAWN \| STATE_SCALED_CONTROLLER_RECENTS
		\| STATE_CURRENT_TASK_FINISHED \| STATE_GESTURE_COMPLETED
		\| STATE_GESTURE_STARTED,
		this::setupLauncherUiAfterSwipeUpAnimation);
		this::setupLauncherUiAfterSwipeUpToRecentsAnimation);

		mStateCallback.addCallback(STATE_HANDLER_INVALIDATED, this::invalidateHandler);
		mStateCallback.addCallback(STATE_LAUNCHER_PRESENT \| STATE_HANDLER_INVALIDATED,
		@@ -647,7 +647,10 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		}

		private void buildAnimationController() {
		if (mStateCallback.hasStates(STATE_GESTURE_COMPLETED)) {
		if (mGestureEndTarget == HOME \|\| (mLauncherTransitionController != null
		&& mLauncherTransitionController.getAnimationPlayer().isStarted())) {
		// We don't want a new mLauncherTransitionController if mGestureEndTarget == HOME (it
		// has its own animation) or if we're already animating the current controller.
		return;
		}
		initTransitionEndpoints(mActivity.getDeviceProfile());
		@@ -1276,12 +1279,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		}

		private void invalidateHandlerWithLauncher() {
		if (mLauncherTransitionController != null) {
		if (mLauncherTransitionController.getAnimationPlayer().isStarted()) {
		mLauncherTransitionController.getAnimationPlayer().cancel();
		}
		mLauncherTransitionController = null;
		}
		endLauncherTransitionController();

		mRecentsView.onGestureAnimationEnd();

		@@ -1289,6 +1287,13 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		mActivity.getRootView().getOverlay().remove(mLiveTileOverlay);
		}

		private void endLauncherTransitionController() {
		if (mLauncherTransitionController != null) {
		mLauncherTransitionController.getAnimationPlayer().end();
		mLauncherTransitionController = null;
		}
		}

		private void notifyTransitionCancelled() {
		mAnimationFactory.onTransitionCancelled();
		}
		@@ -1390,12 +1395,9 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		doLogGesture(HOME);
		}

		private void setupLauncherUiAfterSwipeUpAnimation() {
		if (mLauncherTransitionController != null) {
		mLauncherTransitionController.getAnimationPlayer().end();
		mLauncherTransitionController = null;
		}
		mActivityControlHelper.onSwipeUpComplete(mActivity);
		private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
		endLauncherTransitionController();
		mActivityControlHelper.onSwipeUpToRecentsComplete(mActivity);
		mRecentsAnimationWrapper.setCancelWithDeferredScreenshot(true);
		mRecentsView.onSwipeUpAnimationSuccess();

quickstep/src/com/android/quickstep/ActivityControlHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {

		int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect);

		void onSwipeUpComplete(T activity);
		void onSwipeUpToRecentsComplete(T activity);

		void onAssistantVisibilityChanged(float visibility);