commit 4ff469a2cfbaee672c4887c6f2f9568a803b8156
author Brian Isganitis <brianji@google.com> Fri May 13 03:33:21 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 13 03:33:21 2022 +0000
tree df2c480b8eadb0a4312cc0ce6a3a8e7ecd69b4b6
parent f9c148e9d7dbf2014fda2ba3a974737a76978ebd
parent 05eb78ce964439526870501a1711d9a0ce8dd962

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

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

Change-Id: Ibb91bea7df676b58a1198e1c9ec30a0fc04e35a1
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;