openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Alex Chau 2021-07-01 22:12:54 +00:00 committed by Android (Google) Code Review
parent e54f789de9 e0fcee01b3
commit 679f8bb9ca
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
quickstep/src/com/android/quickstep/views/RecentsView.java
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) {