Adding horizontal swipe support for 3p launcher (2e4b6659) · Commits · e / os / android_packages_apps_Trebuchet

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

+147 −8

Original line number	Diff line number	Diff line
		@@ -18,26 +18,41 @@ package com.android.quickstep;
		import static android.os.VibrationEffect.EFFECT_CLICK;
		import static android.os.VibrationEffect.createPredefined;

		import static com.android.launcher3.Utilities.postAsyncCallback;
		import static com.android.launcher3.anim.Interpolators.DEACCEL;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.quickstep.TouchInteractionService.BACKGROUND_EXECUTOR;
		import static com.android.quickstep.TouchInteractionService.MAIN_THREAD_EXECUTOR;
		import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;

		import android.annotation.TargetApi;
		import android.app.ActivityManager.RunningTaskInfo;
		import android.content.Context;
		import android.content.Intent;
		import android.graphics.PointF;
		import android.os.Build;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.VibrationEffect;
		import android.os.Vibrator;
		import android.provider.Settings;
		import android.view.MotionEvent;
		import android.view.animation.Interpolator;

		import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.graphics.RotationMode;
		import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
		import com.android.quickstep.inputconsumers.InputConsumer;
		import com.android.quickstep.util.ClipAnimationHelper;
		import com.android.quickstep.util.ClipAnimationHelper.TransformParams;
		import com.android.quickstep.util.SwipeAnimationTargetSet.SwipeAnimationListener;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		import com.android.systemui.shared.system.InputConsumerController;
		import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;

		import java.util.function.Consumer;

		@@ -47,7 +62,10 @@ import androidx.annotation.UiThread;
		* Base class for swipe up handler with some utility methods
		*/
		@TargetApi(Build.VERSION_CODES.Q)
		public abstract class BaseSwipeUpHandler implements SwipeAnimationListener {
		public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity>
		implements SwipeAnimationListener {

		private static final String TAG = "BaseSwipeUpHandler";

		// Start resisting when swiping past this factor of mTransitionDragLength.
		private static final float DRAG_LENGTH_FACTOR_START_PULLBACK = 1.4f;
		@@ -61,6 +79,9 @@ public abstract class BaseSwipeUpHandler implements SwipeAnimationListener {
		protected float mDragLengthFactor = 1;

		protected final Context mContext;
		protected final OverviewComponentObserver mOverviewComponentObserver;
		protected final ActivityControlHelper<T> mActivityControlHelper;
		protected final RecentsModel mRecentsModel;

		protected final ClipAnimationHelper mClipAnimationHelper;
		protected final TransformParams mTransformParams = new TransformParams();
		@@ -73,18 +94,48 @@ public abstract class BaseSwipeUpHandler implements SwipeAnimationListener {
		// visible.
		protected final AnimatedFloat mCurrentShift = new AnimatedFloat(this::updateFinalShift);

		protected final ActivityInitListener mActivityInitListener;
		protected final RecentsAnimationWrapper mRecentsAnimationWrapper;

		protected T mActivity;
		protected RecentsView mRecentsView;
		protected DeviceProfile mDp;
		private final int mPageSpacing;

		protected Runnable mGestureEndCallback;

		protected BaseSwipeUpHandler(Context context) {
		protected final Handler mMainThreadHandler = MAIN_THREAD_EXECUTOR.getHandler();
		protected MultiStateCallback mStateCallback;

		protected boolean mCanceled;
		protected int mFinishingRecentsAnimationForNewTaskId = -1;

		protected BaseSwipeUpHandler(Context context,
		OverviewComponentObserver overviewComponentObserver,
		RecentsModel recentsModel, InputConsumerController inputConsumer) {
		mContext = context;
		mClipAnimationHelper = new ClipAnimationHelper(context);
		mOverviewComponentObserver = overviewComponentObserver;
		mActivityControlHelper = overviewComponentObserver.getActivityControlHelper();
		mRecentsModel = recentsModel;
		mActivityInitListener =
		mActivityControlHelper.createActivityInitListener(this::onActivityInit);
		mRecentsAnimationWrapper = new RecentsAnimationWrapper(inputConsumer,
		this::createNewInputProxyHandler);

		mClipAnimationHelper = new ClipAnimationHelper(context);
		mPageSpacing = context.getResources().getDimensionPixelSize(R.dimen.recents_page_spacing);
		mVibrator = context.getSystemService(Vibrator.class);
		}

		public void performHapticFeedback() {
		protected void setStateOnUiThread(int stateFlag) {
		if (Looper.myLooper() == mMainThreadHandler.getLooper()) {
		mStateCallback.setState(stateFlag);
		} else {
		postAsyncCallback(mMainThreadHandler, () -> mStateCallback.setState(stateFlag));
		}
		}

		protected void performHapticFeedback() {
		if (!mVibrator.hasVibrator()) {
		return;
		}
		@@ -130,12 +181,76 @@ public abstract class BaseSwipeUpHandler implements SwipeAnimationListener {
		mGestureEndCallback = gestureEndCallback;
		}

		public abstract Intent getLaunchIntent();

		protected void linkRecentsViewScroll() {
		SyncRtSurfaceTransactionApplierCompat.create(mRecentsView, applier -> {
		mTransformParams.setSyncTransactionApplier(applier);
		mRecentsAnimationWrapper.runOnInit(() ->
		mRecentsAnimationWrapper.targetSet.addDependentTransactionApplier(applier));
		});

		mRecentsView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
		if (moveWindowWithRecentsScroll()) {
		updateFinalShift();
		}
		});
		mRecentsView.setRecentsAnimationWrapper(mRecentsAnimationWrapper);
		mRecentsView.setClipAnimationHelper(mClipAnimationHelper);
		}

		protected void startNewTask(int successStateFlag, Consumer<Boolean> resultCallback) {
		// Launch the task user scrolled to (mRecentsView.getNextPage()).
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		// We finish recents animation inside launchTask() when live tile is enabled.
		mRecentsView.getTaskViewAt(mRecentsView.getNextPage()).launchTask(false /* animate */,
		true /* freezeTaskList */);
		} else {
		int taskId = mRecentsView.getTaskViewAt(mRecentsView.getNextPage()).getTask().key.id;
		mFinishingRecentsAnimationForNewTaskId = taskId;
		mRecentsAnimationWrapper.finish(true /* toRecents */, () -> {
		if (!mCanceled) {
		TaskView nextTask = mRecentsView.getTaskView(taskId);
		if (nextTask != null) {
		nextTask.launchTask(false /* animate /, true / freezeTaskList */,
		success -> {
		resultCallback.accept(success);
		if (!success) {
		mActivityControlHelper.onLaunchTaskFailed(mActivity);
		nextTask.notifyTaskLaunchFailed(TAG);
		} else {
		mActivityControlHelper.onLaunchTaskSuccess(mActivity);
		}
		}, mMainThreadHandler);
		}
		setStateOnUiThread(successStateFlag);
		}
		mCanceled = false;
		mFinishingRecentsAnimationForNewTaskId = -1;
		});
		}
		TOUCH_INTERACTION_LOG.addLog("finishRecentsAnimation", true);
		}

		/**
		* Return true if the window should be translated horizontally if the recents view scrolls
		*/
		protected abstract boolean moveWindowWithRecentsScroll();

		protected abstract boolean onActivityInit(final T activity, Boolean alreadyOnHome);

		/**
		* Called to create a input proxy for the running task
		*/
		@UiThread
		protected abstract InputConsumer createNewInputProxyHandler();

		/**
		* Called when the value of {@link #mCurrentShift} changes
		*/
		@UiThread
		public abstract void updateFinalShift();


		/**
		* Called when motion pause is detected
		*/
		@@ -150,15 +265,39 @@ public abstract class BaseSwipeUpHandler implements SwipeAnimationListener {
		@UiThread
		public abstract void onGestureEnded(float endVelocity, PointF velocity, PointF downPos);

		public void onConsumerAboutToBeSwitched(SwipeSharedState sharedState) { }
		public abstract void onConsumerAboutToBeSwitched(SwipeSharedState sharedState);

		public void setIsLikelyToStartNewTask(boolean isLikelyToStartNewTask) { }

		public void initWhenReady() { }
		public void initWhenReady() {
		// Preload the plan
		mRecentsModel.getTasks(null);

		mActivityInitListener.register();
		}

		/**
		* Applies the transform on the recents animation without any additional null checks
		*/
		protected void applyTransformUnchecked() {
		float shift = mCurrentShift.value;
		float offsetX = mRecentsView == null ? 0 : mRecentsView.getScrollOffset();
		float offsetScale = getTaskCurveScaleForOffsetX(offsetX,
		mClipAnimationHelper.getTargetRect().width());
		mTransformParams.setProgress(shift).setOffsetX(offsetX).setOffsetScale(offsetScale);
		mClipAnimationHelper.applyTransform(mRecentsAnimationWrapper.targetSet,
		mTransformParams);
		}

		private float getTaskCurveScaleForOffsetX(float offsetX, float taskWidth) {
		float distanceToReachEdge = mDp.widthPx / 2 + taskWidth / 2 + mPageSpacing;
		float interpolation = Math.min(1, offsetX / distanceToReachEdge);
		return TaskView.getCurveScaleForInterpolation(interpolation);
		}

		public interface Factory {

		BaseSwipeUpHandler newHandler(RunningTaskInfo runningTask,
		long touchTimeMs, boolean continuingLastGesture);
		long touchTimeMs, boolean continuingLastGesture, boolean isLikelyToStartNewTask);
		}
		}

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

+8 −12

Original line number	Diff line number	Diff line
		@@ -649,20 +649,17 @@ public class TouchInteractionService extends Service implements

		final boolean shouldDefer;
		final BaseSwipeUpHandler.Factory factory;
		final Intent homeIntent;

		if (mMode == Mode.NO_BUTTON && !mOverviewComponentObserver.isHomeAndOverviewSame()) {
		shouldDefer = true;
		shouldDefer = !sSwipeSharedState.recentsAnimationFinishInterrupted;
		factory = mFallbackNoButtonFactory;
		homeIntent = mOverviewComponentObserver.getHomeIntent();
		} else {
		shouldDefer = mOverviewComponentObserver.getActivityControlHelper()
		.deferStartingActivity(mActiveNavBarRegion, event);
		factory = mWindowTreansformFactory;
		homeIntent = mOverviewComponentObserver.getOverviewIntent();
		}

		return new OtherActivityInputConsumer(this, runningTaskInfo, homeIntent,
		return new OtherActivityInputConsumer(this, runningTaskInfo,
		shouldDefer, mOverviewCallbacks, this::onConsumerInactive,
		sSwipeSharedState, mInputMonitorCompat, mSwipeTouchRegion,
		disableHorizontalSwipe(event), factory);
		@@ -809,16 +806,15 @@ public class TouchInteractionService extends Service implements
		}

		private BaseSwipeUpHandler createWindowTransformSwipeHandler(RunningTaskInfo runningTask,
		long touchTimeMs, boolean continuingLastGesture) {
		return new WindowTransformSwipeHandler(
		runningTask, this, touchTimeMs,
		mOverviewComponentObserver.getActivityControlHelper(),
		continuingLastGesture, mInputConsumer, mRecentsModel);
		long touchTimeMs, boolean continuingLastGesture, boolean isLikelyToStartNewTask) {
		return new WindowTransformSwipeHandler(runningTask, this, touchTimeMs,
		mOverviewComponentObserver, continuingLastGesture, mInputConsumer, mRecentsModel);
		}

		private BaseSwipeUpHandler createFallbackNoButtonSwipeHandler(RunningTaskInfo runningTask,
		long touchTimeMs, boolean continuingLastGesture) {
		return new FallbackNoButtonInputConsumer(this, mOverviewComponentObserver, runningTask);
		long touchTimeMs, boolean continuingLastGesture, boolean isLikelyToStartNewTask) {
		return new FallbackNoButtonInputConsumer(this, mOverviewComponentObserver, runningTask,
		mRecentsModel, mInputConsumer, isLikelyToStartNewTask, continuingLastGesture);
		}

		public static void startRecentsActivityAsync(Intent intent, RecentsAnimationListener listener) {

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

+32 −103

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.quickstep;
		import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER;
		import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
		import static com.android.launcher3.Utilities.SINGLE_FRAME_MS;
		import static com.android.launcher3.Utilities.postAsyncCallback;
		import static com.android.launcher3.anim.Interpolators.ACCEL_1_5;
		import static com.android.launcher3.anim.Interpolators.DEACCEL;
		import static com.android.launcher3.anim.Interpolators.LINEAR;
		@@ -32,7 +31,6 @@ import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATI
		import static com.android.quickstep.ActivityControlHelper.AnimationFactory.ShelfAnimState.HIDE;
		import static com.android.quickstep.ActivityControlHelper.AnimationFactory.ShelfAnimState.PEEK;
		import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;
		import static com.android.quickstep.TouchInteractionService.MAIN_THREAD_EXECUTOR;
		import static com.android.quickstep.TouchInteractionService.TOUCH_INTERACTION_LOG;
		import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.HOME;
		import static com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget.LAST_TASK;
		@@ -48,14 +46,13 @@ import android.animation.ValueAnimator;
		import android.annotation.TargetApi;
		import android.app.ActivityManager.RunningTaskInfo;
		import android.content.Context;
		import android.content.Intent;
		import android.graphics.Canvas;
		import android.graphics.Point;
		import android.graphics.PointF;
		import android.graphics.Rect;
		import android.graphics.RectF;
		import android.os.Build;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.SystemClock;
		import android.util.Log;
		import android.view.View;
		@@ -82,7 +79,6 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
		import com.android.launcher3.util.RaceConditionTracker;
		import com.android.launcher3.util.TraceHelper;
		import com.android.launcher3.views.FloatingIconView;
		import com.android.quickstep.ActivityControlHelper.ActivityInitListener;
		import com.android.quickstep.ActivityControlHelper.AnimationFactory;
		import com.android.quickstep.ActivityControlHelper.AnimationFactory.ShelfAnimState;
		import com.android.quickstep.ActivityControlHelper.HomeAnimationFactory;
		@@ -99,14 +95,14 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
		import com.android.systemui.shared.system.InputConsumerController;
		import com.android.systemui.shared.system.LatencyTrackerCompat;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
		import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
		import com.android.systemui.shared.system.WindowCallbacksCompat;

		import androidx.annotation.NonNull;
		import androidx.annotation.UiThread;

		@TargetApi(Build.VERSION_CODES.O)
		public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends BaseSwipeUpHandler
		public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		extends BaseSwipeUpHandler<T>
		implements OnApplyWindowInsetsListener {
		private static final String TAG = WindowTransformSwipeHandler.class.getSimpleName();

		@@ -219,35 +215,24 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		// Either RectFSpringAnim (if animating home) or ObjectAnimator (from mCurrentShift) otherwise
		private RunningWindowAnim mRunningWindowAnim;
		private boolean mIsShelfPeeking;
		private DeviceProfile mDp;

		private boolean mContinuingLastGesture;
		// To avoid UI jump when gesture is started, we offset the animation by the threshold.
		private float mShiftAtGestureStart = 0;

		private final Handler mMainThreadHandler = MAIN_THREAD_EXECUTOR.getHandler();

		private final ActivityControlHelper<T> mActivityControlHelper;
		private final ActivityInitListener mActivityInitListener;
		private final RecentsModel mRecentsModel;

		private final SysUINavigationMode.Mode mMode;
		private final Mode mMode;

		private final int mRunningTaskId;
		private ThumbnailData mTaskSnapshot;

		private MultiStateCallback mStateCallback;
		// Used to control launcher components throughout the swipe gesture.
		private AnimatorPlaybackController mLauncherTransitionController;
		private boolean mHasLauncherTransitionControllerStarted;

		private T mActivity;
		private AnimationFactory mAnimationFactory = (t) -> { };
		private LiveTileOverlay mLiveTileOverlay = new LiveTileOverlay();

		private boolean mCanceled;
		private boolean mWasLauncherAlreadyVisible;
		private int mFinishingRecentsAnimationForNewTaskId = -1;

		private boolean mPassedOverviewThreshold;
		private boolean mGestureStarted;
		@@ -256,24 +241,17 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		private PointF mDownPos;
		private boolean mIsLikelyToStartNewTask;

		private final RecentsAnimationWrapper mRecentsAnimationWrapper;

		private final long mTouchTimeMs;
		private long mLauncherFrameDrawnTime;

		public WindowTransformSwipeHandler(RunningTaskInfo runningTaskInfo, Context context,
		long touchTimeMs, ActivityControlHelper<T> controller, boolean continuingLastGesture,
		long touchTimeMs, OverviewComponentObserver overviewComponentObserver,
		boolean continuingLastGesture,
		InputConsumerController inputConsumer, RecentsModel recentsModel) {
		super(context);
		super(context, overviewComponentObserver, recentsModel, inputConsumer);
		mRunningTaskId = runningTaskInfo.id;
		mTouchTimeMs = touchTimeMs;
		mActivityControlHelper = controller;
		mRecentsModel = recentsModel;
		mActivityInitListener = mActivityControlHelper
		.createActivityInitListener(this::onActivityInit);
		mContinuingLastGesture = continuingLastGesture;
		mRecentsAnimationWrapper = new RecentsAnimationWrapper(inputConsumer,
		this::createNewInputProxyHandler);

		mMode = SysUINavigationMode.getMode(context);
		initStateCallbacks();
		@@ -342,14 +320,6 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		}
		}

		private void setStateOnUiThread(int stateFlag) {
		if (Looper.myLooper() == mMainThreadHandler.getLooper()) {
		mStateCallback.setState(stateFlag);
		} else {
		postAsyncCallback(mMainThreadHandler, () -> mStateCallback.setState(stateFlag));
		}
		}

		private Rect getStackBounds(DeviceProfile dp) {
		if (mActivity != null) {
		int loc[] = new int[2];
		@@ -383,14 +353,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		}

		@Override
		public void initWhenReady() {
		// Preload the plan
		mRecentsModel.getTasks(null);

		mActivityInitListener.register();
		}

		private boolean onActivityInit(final T activity, Boolean alreadyOnHome) {
		protected boolean onActivityInit(final T activity, Boolean alreadyOnHome) {
		if (mActivity == activity) {
		return true;
		}
		@@ -411,19 +374,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		}

		mRecentsView = activity.getOverviewPanel();
		SyncRtSurfaceTransactionApplierCompat.create(mRecentsView, applier -> {
		mTransformParams.setSyncTransactionApplier(applier);
		mRecentsAnimationWrapper.runOnInit(() ->
		mRecentsAnimationWrapper.targetSet.addDependentTransactionApplier(applier));
		});

		mRecentsView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
		if (mGestureEndTarget != HOME) {
		updateFinalShift();
		}
		});
		mRecentsView.setRecentsAnimationWrapper(mRecentsAnimationWrapper);
		mRecentsView.setClipAnimationHelper(mClipAnimationHelper);
		linkRecentsViewScroll();
		mRecentsView.setLiveTileOverlay(mLiveTileOverlay);
		mActivity.getRootView().getOverlay().add(mLiveTileOverlay);

		@@ -438,6 +389,11 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		return true;
		}

		@Override
		protected boolean moveWindowWithRecentsScroll() {
		return mGestureEndTarget != HOME;
		}

		private void onLauncherStart(final T activity) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "onLauncherStart");
		@@ -654,20 +610,18 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		updateLauncherTransitionProgress();
		}

		@UiThread
		@Override
		public Intent getLaunchIntent() {
		return mOverviewComponentObserver.getOverviewIntent();
		}

		@Override
		public void updateFinalShift() {
		float shift = mCurrentShift.value;

		SwipeAnimationTargetSet controller = mRecentsAnimationWrapper.getController();
		if (controller != null) {
		float offsetX = mRecentsView == null ? 0 : mRecentsView.getScrollOffset();
		float offsetScale = getTaskCurveScaleForOffsetX(offsetX,
		mClipAnimationHelper.getTargetRect().width());
		mTransformParams.setProgress(shift).setOffsetX(offsetX).setOffsetScale(offsetScale);
		mClipAnimationHelper.applyTransform(mRecentsAnimationWrapper.targetSet,
		mTransformParams);
		updateSysUiFlags(shift);
		applyTransformUnchecked();
		updateSysUiFlags(mCurrentShift.value);
		}

		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		@@ -817,8 +771,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends
		handleNormalGestureEnd(endVelocity, isFling, velocity, false /* isCancel */);
		}

		@UiThread
		private InputConsumer createNewInputProxyHandler() {
		@Override
		protected InputConsumer createNewInputProxyHandler() {
		endRunningWindowAnim(true /* cancel */);
		endLauncherTransitionController();
		if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		@@ -1208,41 +1162,16 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> extends

		@UiThread
		private void startNewTask() {
		// Launch the task user scrolled to (mRecentsView.getNextPage()).
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		// We finish recents animation inside launchTask() when live tile is enabled.
		mRecentsView.getTaskViewAt(mRecentsView.getNextPage()).launchTask(false /* animate */,
		true /* freezeTaskList */);
		} else {
		int taskId = mRecentsView.getTaskViewAt(mRecentsView.getNextPage()).getTask().key.id;
		mFinishingRecentsAnimationForNewTaskId = taskId;
		mRecentsAnimationWrapper.finish(true /* toRecents */, () -> {
		if (!mCanceled) {
		TaskView nextTask = mRecentsView.getTaskView(taskId);
		if (nextTask != null) {
		nextTask.launchTask(false /* animate /, true / freezeTaskList */,
		success -> {
		startNewTask(STATE_HANDLER_INVALIDATED, success -> {
		if (!success) {
		// We couldn't launch the task, so take user to overview so they can
		// decide what to do instead of staying in this broken state.
		endLauncherTransitionController();
		mActivityControlHelper.onLaunchTaskFailed(mActivity);
		nextTask.notifyTaskLaunchFailed(TAG);
		updateSysUiFlags(1 /* windowProgress == overview */);
		} else {
		mActivityControlHelper.onLaunchTaskSuccess(mActivity);
		}
		}, mMainThreadHandler);
		doLogGesture(NEW_TASK);
		}
		reset();
		}
		mCanceled = false;
		mFinishingRecentsAnimationForNewTaskId = -1;
		});
		}
		TOUCH_INTERACTION_LOG.addLog("finishRecentsAnimation", true);
		}

		private void reset() {
		setStateOnUiThread(STATE_HANDLER_INVALIDATED);

quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,12 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity> {
		super.draw(canvas);
		}

		@Override
		public void reset() {
		super.reset();
		resetViewUI();
		}

		@Override
		protected void getTaskSize(DeviceProfile dp, Rect outRect) {
		LayoutUtils.calculateFallbackTaskSize(getContext(), dp, outRect);
		@@ -114,6 +120,12 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity> {
		}
		}

		@Override
		public void resetTaskVisuals() {
		super.resetTaskVisuals();
		setFullscreenProgress(mFullscreenProgress);
		}

		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
		super.onLayout(changed, left, top, right, bottom);

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/FallbackNoButtonInputConsumer.java

+244 −60

File changed.

Preview size limit exceeded, changes collapsed.