commit c3954dcaf57d48bc0772a80c6b021cabf334abf6
author Brian Isganitis <brianji@google.com> Thu May 12 20:16:18 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 12 20:16:18 2022 +0000
tree 7de9f873d223d72c05c5a9ee56d293c73fc58668
parent a617ae9016d8639f797b7771782f9c2e03f7cc61
parent b6adb66e0fe9af895eb78a021097bfa6f1b10977

Merge "Ignore swipe velocity if next task is considered the destination." into tm-dev am: de0c8c7c1b am: b6adb66e0f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18299230

Change-Id: I29c794cd106de274c105599376846a66fe9122f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

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;