summaryrefslogtreecommitdiff
path: root/quickstep
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2022-06-14 21:20:05 +0000
committerWinson Chung <winsonc@google.com>2022-06-14 21:20:05 +0000
commit2345fee56630ccabdc67acbb050b267a995edbf3 (patch)
tree5c5255cba88d1ef65e9cbb384f7973f43b384073 /quickstep
parent0b944f6a4d3e53fd6ac84673805fe5cdd5ef640c (diff)
downloadLauncher3-2345fee56630ccabdc67acbb050b267a995edbf3.tar.gz
Snap to running task if it's offscreen when back is invoked
- If the user has scrolled the running task offscreen, then snap back to the task if back is invoked. Bug: 233952141 Test: Swipe to overview, scroll away from the current task and then go back Change-Id: Icc5040d4b38c97e0329f937e24bd517a71a32f13
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 429f209e94..6427e0981a 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -131,9 +131,14 @@ public class OverviewState extends LauncherState {
@Override
public void onBackPressed(Launcher launcher) {
- TaskView taskView = launcher.<RecentsView>getOverviewPanel().getRunningTaskView();
+ RecentsView recentsView = launcher.getOverviewPanel();
+ TaskView taskView = recentsView.getRunningTaskView();
if (taskView != null) {
- taskView.launchTasks();
+ if (recentsView.isTaskViewFullyVisible(taskView)) {
+ taskView.launchTasks();
+ } else {
+ recentsView.snapToPage(recentsView.indexOfChild(taskView));
+ }
} else {
super.onBackPressed(launcher);
}