diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-08-09 16:17:37 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2019-08-13 11:45:06 -0700 |
commit | a2cfc2d95e1ae5d8b44e3f63a620d7a819bc826c (patch) | |
tree | 261ae706ad46843f6e7371585ba479be87448d92 /quickstep/recents_ui_overrides | |
parent | 0a9e91b6e4ad5c4828789862aab819a6eb004c35 (diff) | |
download | android_packages_apps_Trebuchet-a2cfc2d95e1ae5d8b44e3f63a620d7a819bc826c.tar.gz android_packages_apps_Trebuchet-a2cfc2d95e1ae5d8b44e3f63a620d7a819bc826c.tar.bz2 android_packages_apps_Trebuchet-a2cfc2d95e1ae5d8b44e3f63a620d7a819bc826c.zip |
Always go to home in case of fling-up
Bug: 138881088
Change-Id: I86bf4c7a495805d5912b102470e72a51e843a222
Diffstat (limited to 'quickstep/recents_ui_overrides')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index 7a67a2a15..0d29e5df8 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -736,18 +736,19 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> : LAST_TASK; } } else { - if (mMode == Mode.NO_BUTTON && endVelocity < 0 && !mIsShelfPeeking) { + // If swiping at a diagonal, base end target on the faster velocity. + boolean isSwipeUp = endVelocity < 0; + boolean willGoToNewTaskOnSwipeUp = + goingToNewTask && Math.abs(velocity.x) > Math.abs(endVelocity); + + if (mMode == Mode.NO_BUTTON && isSwipeUp && !willGoToNewTaskOnSwipeUp) { + endTarget = HOME; + } else if (mMode == Mode.NO_BUTTON && isSwipeUp && !mIsShelfPeeking) { // If swiping at a diagonal, base end target on the faster velocity. - endTarget = goingToNewTask && Math.abs(velocity.x) > Math.abs(endVelocity) - ? NEW_TASK : HOME; - } else if (endVelocity < 0) { - if (reachedOverviewThreshold) { - endTarget = RECENTS; - } else { - // If swiping at a diagonal, base end target on the faster velocity. - endTarget = goingToNewTask && Math.abs(velocity.x) > Math.abs(endVelocity) - ? NEW_TASK : RECENTS; - } + endTarget = NEW_TASK; + } else if (isSwipeUp) { + endTarget = !reachedOverviewThreshold && willGoToNewTaskOnSwipeUp + ? NEW_TASK : RECENTS; } else { endTarget = goingToNewTask ? NEW_TASK : LAST_TASK; } |