Merge "Clean up the legacy split screen (6/n)" into tm-dev (fafcf3c4) · Commits · e / os / android_frameworks_base

core/java/android/app/WindowConfiguration.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -840,15 +840,6 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu
		&& windowingMode != WINDOWING_MODE_UNDEFINED;
		}

		/**
		* Returns true if the windowingMode represents a split window.
		* @hide
		*/
		public static boolean isSplitScreenWindowingMode(int windowingMode) {
		return windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY
		\|\| windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
		}

		/**
		* Returns true if the windows associated with this window configuration can receive input keys.
		* @hide

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
		import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
		import static android.app.WindowConfiguration.activityTypeToString;
		import static android.app.WindowConfiguration.isSplitScreenWindowingMode;
		import static android.app.admin.DevicePolicyResources.Drawables.Source.PROFILE_SWITCH_ANIMATION;
		import static android.app.admin.DevicePolicyResources.Drawables.Style.OUTLINE;
		import static android.app.admin.DevicePolicyResources.Drawables.WORK_PROFILE_ICON;
		@@ -7515,8 +7514,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		final int parentWindowingMode =
		newParentConfiguration.windowConfiguration.getWindowingMode();
		final boolean isFixedOrientationLetterboxAllowed =
		isSplitScreenWindowingMode(parentWindowingMode)
		\|\| parentWindowingMode == WINDOWING_MODE_MULTI_WINDOW
		parentWindowingMode == WINDOWING_MODE_MULTI_WINDOW
		\|\| parentWindowingMode == WINDOWING_MODE_FULLSCREEN;
		// TODO(b/181207944): Consider removing the if condition and always run
		// resolveFixedOrientationConfiguration() since this should be applied for all cases.

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

+2 −28

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
		import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
		import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
		import static android.app.WindowConfiguration.activityTypeToString;
		import static android.app.WindowConfiguration.windowingModeToString;
		import static android.app.WindowConfigurationProto.WINDOWING_MODE;
		@@ -475,33 +473,9 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> {
		return WindowConfiguration.inMultiWindowMode(windowingMode);
		}

		/** Returns true if this container is currently in split-screen windowing mode. */
		public boolean inSplitScreenWindowingMode() {
		/@WindowConfiguration.WindowingMode/ int windowingMode =
		mFullConfiguration.windowConfiguration.getWindowingMode();

		return windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY
		\|\| windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
		}

		/** Returns true if this container is currently in split-screen secondary windowing mode. */
		public boolean inSplitScreenSecondaryWindowingMode() {
		/@WindowConfiguration.WindowingMode/ int windowingMode =
		mFullConfiguration.windowConfiguration.getWindowingMode();

		return windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
		}

		public boolean inSplitScreenPrimaryWindowingMode() {
		return mFullConfiguration.windowConfiguration.getWindowingMode()
		== WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
		}

		/**
		* Returns true if this container can be put in either
		* {@link WindowConfiguration#WINDOWING_MODE_SPLIT_SCREEN_PRIMARY} or
		* {@link WindowConfiguration##WINDOWING_MODE_SPLIT_SCREEN_SECONDARY} windowing modes based on
		* its current state.
		* Returns true if this container supports split-screen multi-window and can be put in
		* split-screen based on its current state.
		*/
		public boolean supportsSplitScreenWindowingMode() {
		return mFullConfiguration.windowConfiguration.supportSplitScreenWindowingMode();

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
		import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
		import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
		import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
		@@ -5579,13 +5578,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		}

		static boolean alwaysCreateRootTask(int windowingMode, int activityType) {
		// Always create a root task for fullscreen, freeform, and split-screen-secondary windowing
		// Always create a root task for fullscreen, freeform, and multi windowing
		// modes so that we can manage visual ordering and return types correctly.
		return activityType == ACTIVITY_TYPE_STANDARD
		&& (windowingMode == WINDOWING_MODE_FULLSCREEN
		\|\| windowingMode == WINDOWING_MODE_FREEFORM
		\|\| windowingMode == WINDOWING_MODE_PINNED
		\|\| windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY
		\|\| windowingMode == WINDOWING_MODE_MULTI_WINDOW);
		}

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,6 @@ class DragResizeMode {
		switch (mode) {
		case DRAG_RESIZE_MODE_FREEFORM:
		return rootTask.getWindowingMode() == WINDOWING_MODE_FREEFORM;
		case DRAG_RESIZE_MODE_DOCKED_DIVIDER:
		return rootTask.inSplitScreenWindowingMode();
		default:
		return false;
		}