Merge "Revert "Snap to last task if swiping down at a greater Y than X velocity."" into tm-dev am: a3ce2fc552
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420831
Change-Id: I7fc0db6178c600ee9de18ad4e8b7ea3deb857c2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 1b1cb85..21728ad 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1032,19 +1032,19 @@
return RECENTS;
}
final GestureEndTarget endTarget;
- final boolean canGoToNewTask;
+ final boolean goingToNewTask;
if (mRecentsView != null) {
if (!hasTargets()) {
// If there are no running tasks, then we can assume that this is a continuation of
// the last gesture, but after the recents animation has finished
- canGoToNewTask = true;
+ goingToNewTask = true;
} else {
final int runningTaskIndex = mRecentsView.getRunningTaskIndex();
final int taskToLaunch = mRecentsView.getNextPage();
- canGoToNewTask = runningTaskIndex >= 0 && taskToLaunch != runningTaskIndex;
+ goingToNewTask = runningTaskIndex >= 0 && taskToLaunch != runningTaskIndex;
}
} else {
- canGoToNewTask = false;
+ goingToNewTask = false;
}
final boolean reachedOverviewThreshold = mCurrentShift.value >= MIN_PROGRESS_FOR_OVERVIEW;
final boolean isFlingX = Math.abs(velocity.x) > mContext.getResources()
@@ -1053,13 +1053,13 @@
if (isCancel) {
endTarget = LAST_TASK;
} else if (mDeviceState.isFullyGesturalNavMode()) {
- if (canGoToNewTask && isFlingX) {
+ if (goingToNewTask && isFlingX) {
// Flinging towards new task takes precedence over mIsMotionPaused (which only
// checks y-velocity).
endTarget = NEW_TASK;
} else if (mIsMotionPaused) {
endTarget = RECENTS;
- } else if (canGoToNewTask) {
+ } else if (goingToNewTask) {
endTarget = NEW_TASK;
} else {
endTarget = !reachedOverviewThreshold ? LAST_TASK : HOME;
@@ -1067,22 +1067,26 @@
} else {
endTarget = reachedOverviewThreshold && mGestureStarted
? RECENTS
- : canGoToNewTask
+ : goingToNewTask
? NEW_TASK
: LAST_TASK;
}
} else {
// If swiping at a diagonal, base end target on the faster velocity.
boolean isSwipeUp = endVelocity < 0;
- boolean willGoToNewTask =
- canGoToNewTask && Math.abs(velocity.x) > Math.abs(endVelocity);
+ boolean willGoToNewTaskOnSwipeUp =
+ goingToNewTask && Math.abs(velocity.x) > Math.abs(endVelocity);
- if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp) {
- endTarget = willGoToNewTask ? NEW_TASK : HOME;
+ if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp && !willGoToNewTaskOnSwipeUp) {
+ endTarget = HOME;
+ } else if (mDeviceState.isFullyGesturalNavMode() && isSwipeUp) {
+ // If swiping at a diagonal, base end target on the faster velocity.
+ endTarget = NEW_TASK;
} else if (isSwipeUp) {
- endTarget = (!reachedOverviewThreshold && willGoToNewTask) ? NEW_TASK : RECENTS;
+ endTarget = !reachedOverviewThreshold && willGoToNewTaskOnSwipeUp
+ ? NEW_TASK : RECENTS;
} else {
- endTarget = willGoToNewTask ? NEW_TASK : LAST_TASK; // Swipe is downward.
+ endTarget = goingToNewTask ? NEW_TASK : LAST_TASK;
}
}
@@ -1167,8 +1171,6 @@
duration = Math.max(duration, mRecentsView.getScroller().getDuration());
}
}
- } else if (endTarget == LAST_TASK && mRecentsView != null) {
- mRecentsView.snapToPage(mRecentsView.getCurrentPage(), Math.toIntExact(duration));
}
// Let RecentsView handle the scrolling to the task, which we launch in startNewTask()