Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52fef381 authored by Brian Isganitis's avatar Brian Isganitis Committed by Automerger Merge Worker
Browse files

Merge "Revert "Ignore swipe velocity if next task is considered the... 

Merge "Revert "Ignore swipe velocity if next task is considered the destination."" into tm-dev am: a7783dba am: 05eb78ce am: 4ff469a2

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



Change-Id: I70d95c429730c6a7b4a7380c3597749cf7065fae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0d2e2d4 4ff469a2

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

+3 −4
Original line number Diff line number Diff line
@@ -1065,11 +1065,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                                : 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;