Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev (679f8bb9) · Commits · e / os / BlissLauncher3

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -1087,6 +1087,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		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);

		@@ -1126,6 +1132,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		} 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) {