Merge "Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated" into sc-dev (464fc41d) · Commits · e / os / android_packages_apps_Trebuchet

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -1146,20 +1146,24 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		}
		updateTaskSize();

		int targetPage = -1;
		if (mNextPage == INVALID_PAGE) {
		// Set the current page to the running task, but not if settling on new task.
		TaskView runningTaskView = getRunningTaskView();
		if (runningTaskView != null) {
		setCurrentPage(indexOfChild(runningTaskView));
		targetPage = indexOfChild(runningTaskView);
		} else if (getTaskViewCount() > 0) {
		setCurrentPage(indexOfChild(getTaskViewAt(0)));
		targetPage = indexOfChild(getTaskViewAt(0));
		}
		} else if (currentTaskId != -1) {
		currentTaskView = getTaskView(currentTaskId);
		if (currentTaskView != null) {
		setCurrentPage(indexOfChild(currentTaskView));
		targetPage = indexOfChild(currentTaskView);
		}
		}
		if (targetPage != -1 && mCurrentPage != targetPage) {
		setCurrentPage(targetPage);
		}

		if (mIgnoreResetTaskId != -1 && getTaskView(mIgnoreResetTaskId) != ignoreResetTaskView) {
		// If the taskView mapping is changing, do not preserve the visuals. Since we are