Merge "[wm]: Move split-secondary stack to front when split-screen is dismissed" (47c546f6) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -1302,6 +1302,11 @@ class ActivityStack extends ConfigurationContainer {
		return;
		}

		getDisplay().positionChildAtBottom(this, reason);
		if (task != null) {
		insertTaskAtBottom(task);
		}

		/**
		* The intent behind moving a primary split screen stack to the back is usually to hide
		* behind the home stack. Exit split screen in this case.
		@@ -1309,11 +1314,6 @@ class ActivityStack extends ConfigurationContainer {
		if (getWindowingMode() == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY) {
		setWindowingMode(WINDOWING_MODE_UNDEFINED);
		}

		getDisplay().positionChildAtBottom(this, reason);
		if (task != null) {
		insertTaskAtBottom(task);
		}
		}

		boolean isFocusable() {

+3 −3

Original line number	Diff line number	Diff line
		@@ -3918,10 +3918,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		// Caller wants the current split-screen primary stack to be the top stack after
		// it goes fullscreen, so move it to the front.
		stack.moveToFront("dismissSplitScreenMode");
		} else if (mRootActivityContainer.isTopDisplayFocusedStack(stack)) {
		} else {
		// In this case the current split-screen primary stack shouldn't be the top
		// stack after it goes fullscreen, but it current has focus, so we move the
		// focus to the top-most split-screen secondary stack next to it.
		// stack after it goes fullscreen, so we move the focus to the top-most
		// split-screen secondary stack next to it.
		final ActivityStack otherStack = stack.getDisplay().getTopStackInWindowingMode(
		WINDOWING_MODE_SPLIT_SCREEN_SECONDARY);
		if (otherStack != null) {