Merge "Don't dismiss split during enter if already visible" into udc-dev (1f23db54) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -1502,6 +1502,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		// Legacy transition we need to create divider here, shell transition case we will
		// create it on #finishEnterSplitScreen
		mSplitLayout.init();
		} else {
		// We handle split visibility itself on shell transition, but sometimes we didn't
		// reset it correctly after dismiss by some reason, so just set invisible before active.
		setSplitsVisible(false);
		}
		if (taskInfo != null) {
		setSideStagePosition(startPosition, wct);
		@@ -2642,11 +2646,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,

		if (mSplitTransitions.mPendingEnter.mExtraTransitType
		== TRANSIT_SPLIT_SCREEN_OPEN_TO_SIDE) {
		// Open to side should only be used when split already active and foregorund.
		if (mainChild == null && sideChild == null) {
		Log.w(TAG, "Launched a task in split, but didn't receive any task in transition.");
		mSplitTransitions.mPendingEnter.cancel((cancelWct, cancelT)
		-> prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, cancelWct));
		mSplitUnsupportedToast.show();
		// This should happen when the target app is already on front, so just cancel.
		mSplitTransitions.mPendingEnter.cancel(null);
		return true;
		}
		} else {