Merge "Fix quickswitch flickers/ignored swipes" into ub-launcher3-qt-future-dev (97881839) · Commits · e / os / android_packages_apps_Trebuchet

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -922,8 +922,16 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		windowAnim.addListener(new AnimationSuccessListener() {
		@Override
		public void onAnimationSuccess(Animator animator) {
		if (target == NEW_TASK && mRecentsView != null
		&& mRecentsView.getNextPage() == mRecentsView.getRunningTaskIndex()) {
		// We are about to launch the current running task, so use LAST_TASK state
		// instead of NEW_TASK. This could happen, for example, if our scroll is
		// aborted after we determined the target to be NEW_TASK.
		setStateOnUiThread(LAST_TASK.endState);
		} else {
		setStateOnUiThread(target.endState);
		}
		}
		});
		windowAnim.start();
		mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);

+8 −6

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.quickstep.views;

		import static androidx.dynamicanimation.animation.DynamicAnimation.MIN_VISIBLE_CHANGE_PIXELS;

		import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
		import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
		import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
		@@ -573,12 +572,15 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		taskView.bind(task);
		}

		if (mNextPage == INVALID_PAGE) {
		// Set the current page to the running task, but not if settling on new task.
		TaskView runningTaskView = getRunningTaskView();
		if (runningTaskView != null) {
		setCurrentPage(indexOfChild(runningTaskView));
		} else if (getTaskViewCount() > 0) {
		setCurrentPage(indexOfChild(getTaskViewAt(0)));
		}
		}

		if (mIgnoreResetTaskId != -1 && getTaskView(mIgnoreResetTaskId) != ignoreResetTaskView) {
		// If the taskView mapping is changing, do not preserve the visuals. Since we are

+3 −1

Original line number	Diff line number	Diff line
		@@ -1088,9 +1088,11 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
		if (mFreeScroll) {
		setCurrentPage(getNextPage());
		} else if (wasFreeScroll) {
		if (getScrollForPage(getNextPage()) != getScrollX()) {
		snapToPage(getNextPage());
		}
		}
		}

		protected void setEnableOverscroll(boolean enable) {
		mAllowOverScroll = enable;