Merge "Merge "Support exit to full screen to non-split app" into tm-dev am:... (76c19aed) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1786,15 +1786,18 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
	@Override		@Override
	public void onNoLongerSupportMultiWindow() {		public void onNoLongerSupportMultiWindow() {
	if (mMainStage.isActive()) {		if (mMainStage.isActive()) {
			final boolean isMainStage = mMainStageListener == this;
	if (!ENABLE_SHELL_TRANSITIONS) {		if (!ENABLE_SHELL_TRANSITIONS) {
	StageCoordinator.this.exitSplitScreen(null /* childrenToTop */,		StageCoordinator.this.exitSplitScreen(isMainStage ? mMainStage : mSideStage,
	EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW);		EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW);
			return;
	}		}

			final int stageType = isMainStage ? STAGE_TYPE_MAIN : STAGE_TYPE_SIDE;
	final WindowContainerTransaction wct = new WindowContainerTransaction();		final WindowContainerTransaction wct = new WindowContainerTransaction();
	prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, wct);		prepareExitSplitScreen(stageType, wct);
	mSplitTransitions.startDismissTransition(null /* transition */, wct,		mSplitTransitions.startDismissTransition(null /* transition */, wct,
	StageCoordinator.this, STAGE_TYPE_UNDEFINED,		StageCoordinator.this, stageType,
	EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW);		EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW);
	}		}
	}		}