Merge "Prevent dismissing split when pausing tasks trampolines to new activity" into main (f886beb4) · Commits · e / os / android_frameworks_base

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -2859,14 +2859,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		prepareExitSplitScreen(dismissTop, out, EXIT_REASON_APP_FINISHED);
		mSplitTransitions.setDismissTransition(transition, dismissTop,
		EXIT_REASON_APP_FINISHED);
		} else if (isOpening && !mPausingTasks.isEmpty()) {
		// One of the splitting task is opening while animating the split pair in
		// recents, which means to dismiss the split pair to this task.
		int dismissTop = getStageType(stage) == STAGE_TYPE_MAIN
		? STAGE_TYPE_MAIN : STAGE_TYPE_SIDE;
		prepareExitSplitScreen(dismissTop, out, EXIT_REASON_APP_FINISHED);
		mSplitTransitions.setDismissTransition(transition, dismissTop,
		EXIT_REASON_APP_FINISHED);
		} else if (!isSplitScreenVisible() && isOpening) {
		// If split is running in the background and the trigger task is appearing into
		// split, prepare to enter split screen.