commit 7d54b06c29e1bb089fcce7ded7c21dcc89df8d7f
author Winson Chung <winsonc@google.com> Wed Jun 15 03:30:16 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 15 03:30:16 2022 +0000
tree da71f7d750c64f3e3cf27c5d98e1e138513832f1
parent 4ee29221dfb379e4fb736649570a614c6d5d8147
parent 2345fee56630ccabdc67acbb050b267a995edbf3

Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev

quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 429f209..6427e09 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 @@
 
     @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);
         }