commit 05eb78ce964439526870501a1711d9a0ce8dd962
author Brian Isganitis <brianji@google.com> Fri May 13 02:48:52 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 13 02:48:52 2022 +0000
tree 2b44ede82b82c114d0739201def2d59510c8dc12
parent 74306f7aba17e2fa0b73fa2feed87d1ca976a290
parent a7783dba56bfe838879e3631a3faaf7a5c560c78

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

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

Change-Id: Ic49abcb4054e361328858b1368f38a89f1f2cf02
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 dc2b61b..f60b225 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1065,11 +1065,10 @@
                                 : LAST_TASK;
             }
         } else {
-            // If swiping at a diagonal on the current task, base end target on the faster velocity.
+            // If swiping at a diagonal, base end target on the faster velocity.
             boolean isSwipeUp = endVelocity < 0;
-            boolean willGoToNewTask = canGoToNewTask && (
-                    mRecentsView.getDestinationPage() != mRecentsView.getCurrentPage()
-                            || Math.abs(velocity.x) > Math.abs(endVelocity));
+            boolean willGoToNewTask =
+                    canGoToNewTask && Math.abs(velocity.x) > Math.abs(endVelocity);
 
             if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp) {
                 endTarget = willGoToNewTask ? NEW_TASK : HOME;