commit e526fd6a0081785e667eb556e31107835a627063
author Alex Chau <alexchau@google.com> Thu Jul 01 22:28:30 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 01 22:28:30 2021 +0000
tree af94b4c982a64c7b5856c7ce2e1ad673c9a8e06d
parent 1dd0ca7bec61796eef64959b18bf77d5f2b37949
parent 679f8bb9cae34b8e6c43f6480e2268c4d73d7348

Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev am: 679f8bb9ca

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

Change-Id: I4cc43374c577299c7be3d63bb8a7393a90447231

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index d59b459..a72a205 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1100,6 +1100,12 @@
             return;
         }
 
+        int currentTaskId = -1;
+        TaskView currentTaskView = getTaskViewAtByAbsoluteIndex(mCurrentPage);
+        if (currentTaskView != null) {
+            currentTaskId = currentTaskView.getTask().key.id;
+        }
+
         // Unload existing visible task data
         unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
 
@@ -1142,6 +1148,11 @@
             } else if (getTaskViewCount() > 0) {
                 setCurrentPage(indexOfChild(getTaskViewAt(0)));
             }
+        } else if (currentTaskId != -1) {
+            currentTaskView = getTaskView(currentTaskId);
+            if (currentTaskView != null) {
+                setCurrentPage(indexOfChild(currentTaskView));
+            }
         }
 
         if (mIgnoreResetTaskId != -1 && getTaskView(mIgnoreResetTaskId) != ignoreResetTaskView) {