Ignore swipe velocity if next task is considered the destination.
Test: Manual
Bug: 222117127
Change-Id: I5dc0d0a84aae275eebb59a64b59e5344b4b591c4
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index f60b225..dc2b61b 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1065,10 +1065,11 @@
: LAST_TASK;
}
} else {
- // If swiping at a diagonal, base end target on the faster velocity.
+ // If swiping at a diagonal on the current task, base end target on the faster velocity.
boolean isSwipeUp = endVelocity < 0;
- boolean willGoToNewTask =
- canGoToNewTask && Math.abs(velocity.x) > Math.abs(endVelocity);
+ boolean willGoToNewTask = canGoToNewTask && (
+ mRecentsView.getDestinationPage() != mRecentsView.getCurrentPage()
+ || Math.abs(velocity.x) > Math.abs(endVelocity));
if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp) {
endTarget = willGoToNewTask ? NEW_TASK : HOME;