Merge "Use ActivityClientController#enterPictureInPictureMode when restoring... (3677e35a) · Commits · e / os / android_frameworks_base

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ import android.os.UserHandle;
		import android.service.voice.VoiceInteractionManagerInternal;
		import android.util.Slog;
		import android.view.RemoteAnimationDefinition;
		import android.window.DesktopModeFlags;
		import android.window.SizeConfigurationBuckets;
		import android.window.TransitionInfo;

		@@ -1281,7 +1282,7 @@ class ActivityClientController extends IActivityClientController.Stub {
		}
		}

		private static void executeMultiWindowFullscreenRequest(int fullscreenRequest, Task requester) {
		private void executeMultiWindowFullscreenRequest(int fullscreenRequest, Task requester) {
		final int targetWindowingMode;
		if (fullscreenRequest == FULLSCREEN_MODE_REQUEST_ENTER) {
		final int restoreWindowingMode = requester.getRequestedOverrideWindowingMode();
		@@ -1294,8 +1295,14 @@ class ActivityClientController extends IActivityClientController.Stub {
		requester.getParent().mRemoteToken.toWindowContainerToken();
		} else {
		targetWindowingMode = requester.mMultiWindowRestoreWindowingMode;
		if (DesktopModeFlags.ENABLE_REQUEST_FULLSCREEN_BUGFIX.isTrue()
		&& targetWindowingMode == WINDOWING_MODE_PINNED) {
		final ActivityRecord r = requester.topRunningActivity();
		enterPictureInPictureMode(r.token, r.pictureInPictureArgs);
		} else {
		requester.restoreWindowingMode();
		}
		}
		if (targetWindowingMode == WINDOWING_MODE_FULLSCREEN) {
		requester.setBounds(null);
		}