diff options
author | Winson Chung <winsonc@google.com> | 2022-06-15 03:30:16 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-15 03:30:16 +0000 |
commit | 7d54b06c29e1bb089fcce7ded7c21dcc89df8d7f (patch) | |
tree | da71f7d750c64f3e3cf27c5d98e1e138513832f1 /quickstep/src | |
parent | 4ee29221dfb379e4fb736649570a614c6d5d8147 (diff) | |
parent | 2345fee56630ccabdc67acbb050b267a995edbf3 (diff) | |
download | Launcher3-7d54b06c29e1bb089fcce7ded7c21dcc89df8d7f.tar.gz |
Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev
Diffstat (limited to 'quickstep/src')
-rw-r--r-- | quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java | 9 |
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); } |