Merge "Specify windowing mode when starting single intent" into main (ed4d1708) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -1236,7 +1236,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		WindowContainerTransaction wct,
		RemoteTransition remoteTransition) {
		Bundle optionsToLaunch = options != null ? options : new Bundle();
		addActivityOptions(optionsToLaunch, null);
		addActivityOptions(optionsToLaunch, null, WINDOWING_MODE_FULLSCREEN);
		wct.sendPendingIntent(pendingIntent, fillInIntent, optionsToLaunch);
		mSplitTransitions.startFullscreenTransition(wct, remoteTransition);
		}
		@@ -2001,6 +2001,14 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		opts.putAll(options.toBundle());
		}

		private void addActivityOptions(Bundle opts, @Nullable StageTaskListener launchTarget,
		int targetWindowingMode) {
		ActivityOptions options = ActivityOptions.fromBundle(opts);
		options.setLaunchWindowingMode(targetWindowingMode);
		opts.putAll(options.toBundle());
		addActivityOptions(opts, launchTarget);
		}

		void updateActivityOptions(Bundle opts, @SplitPosition int position) {
		addActivityOptions(opts, position == mSideStagePosition ? mSideStage : mMainStage);
		}