Merge "Only adjust the task position when there is no move-to-top request." into rvc-dev (b56d6e13) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/Task.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -2694,9 +2694,16 @@ class Task extends WindowContainer<WindowContainer> {
		return null;
		}

		final ActivityStack rootTask = (ActivityStack) focusableTask.getRootTask();
		if (!moveParentsToTop) {
		// Only move the next stack to top in its task container.
		WindowContainer parent = focusableTask.getParent();
		parent.positionChildAt(POSITION_TOP, focusableTask, false /* includingParents */);
		return rootTask;
		}

		final String myReason = reason + " adjustFocusToNextFocusableStack";
		final ActivityRecord top = focusableTask.topRunningActivity();
		final ActivityStack rootTask = (ActivityStack) focusableTask.getRootTask();
		if (focusableTask.isActivityTypeHome() && (top == null \|\| !top.mVisibleRequested)) {
		// If we will be focusing on the home stack next and its current top activity isn't
		// visible, then use the move the home stack task to top to make the activity visible.
		@@ -2704,13 +2711,6 @@ class Task extends WindowContainer<WindowContainer> {
		return rootTask;
		}

		if (!moveParentsToTop) {
		// Only move the next stack to top in its task container.
		WindowContainer parent = focusableTask.getParent();
		parent.positionChildAt(POSITION_TOP, focusableTask, false /* includingParents */);
		return rootTask;
		}

		// Move the entire hierarchy to top with updating global top resumed activity
		// and focused application if needed.
		focusableTask.moveToFront(myReason);