diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2019-08-13 14:58:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-13 14:58:45 -0700 |
| commit | f3dac0ef130145889898673fa5a41d436bf9dc54 (patch) | |
| tree | a5b9a26775e82cde255dfb0b512efa7c330d12c0 /quickstep | |
| parent | c1a2764a6e488bfdc9952fa9270b6a78309741cd (diff) | |
| parent | a2cfc2d95e1ae5d8b44e3f63a620d7a819bc826c (diff) | |
| download | android_packages_apps_Trebuchet-f3dac0ef130145889898673fa5a41d436bf9dc54.tar.gz android_packages_apps_Trebuchet-f3dac0ef130145889898673fa5a41d436bf9dc54.tar.bz2 android_packages_apps_Trebuchet-f3dac0ef130145889898673fa5a41d436bf9dc54.zip | |
Always go to home in case of fling-up
am: a2cfc2d95e
Change-Id: I560fd690882998a9b503d5c30eda7f9397db138e
Diffstat (limited to 'quickstep')
| -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; } |