PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I409622ab04cc934290013203281329987e0ae5ec
This commit is contained in:
Alex Chau
2021-07-01 22:27:33 +00:00
committed by Automerger Merge Worker
parent ec5c2ea87e 679f8bb9ca
commit 4eabe23108
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/RecentsView.java
+11
View File
@@ -1087,6 +1087,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
return; return;
} }
int currentTaskId = -1;
TaskView currentTaskView = getTaskViewAtByAbsoluteIndex(mCurrentPage);
if (currentTaskView != null) {
currentTaskId = currentTaskView.getTask().key.id;
}
// Unload existing visible task data // Unload existing visible task data
unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL); unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
@@ -1126,6 +1132,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
} else if (getTaskViewCount() > 0) { } else if (getTaskViewCount() > 0) {
setCurrentPage(indexOfChild(getTaskViewAt(0))); setCurrentPage(indexOfChild(getTaskViewAt(0)));
} }
} else if (currentTaskId != -1) {
currentTaskView = getTaskView(currentTaskId);
if (currentTaskView != null) {
setCurrentPage(indexOfChild(currentTaskView));
}
} }
if (mIgnoreResetTaskId != -1 && getTaskView(mIgnoreResetTaskId) != ignoreResetTaskView) { if (mIgnoreResetTaskId != -1 && getTaskView(mIgnoreResetTaskId) != ignoreResetTaskView) {