commit 4d5ce7c16ca2b5ebf6c81deae099e71a36d87f9f
author Winson Chung <winsonc@google.com> Wed Jun 15 04:23:50 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 15 04:23:50 2022 +0000
tree 824ae84536a5a809d157fc24aa125fe7cee5266e
parent ec8a85099ebdcd6edd3d017ce2887a4f3eeee4f0
parent 43f3398d25f07de8c520c7ef0af2f7247ef8dd60

Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev am: 7d54b06c29 am: 43f3398d25

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18897728

Change-Id: Iaf6037519f6985c44d6198bc772f3a6ef375b87f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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);
         }