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

core/api/test-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -483,8 +483,6 @@ package android.app {
		field public static final int WINDOWING_MODE_FULLSCREEN = 1; // 0x1
		field public static final int WINDOWING_MODE_MULTI_WINDOW = 6; // 0x6
		field public static final int WINDOWING_MODE_PINNED = 2; // 0x2
		field public static final int WINDOWING_MODE_SPLIT_SCREEN_PRIMARY = 3; // 0x3
		field public static final int WINDOWING_MODE_SPLIT_SCREEN_SECONDARY = 4; // 0x4
		field public static final int WINDOWING_MODE_UNDEFINED = 0; // 0x0
		}

core/java/android/app/WindowConfiguration.java

+2 −20

Original line number	Diff line number	Diff line
		@@ -104,19 +104,6 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu
		public static final int WINDOWING_MODE_FULLSCREEN = 1;
		/** Always on-top (always visible). of other siblings in its parent container. */
		public static final int WINDOWING_MODE_PINNED = 2;
		/** The primary container driving the screen to be in split-screen mode. */
		// TODO: Remove once split-screen is migrated to wm-shell.
		public static final int WINDOWING_MODE_SPLIT_SCREEN_PRIMARY = 3;
		/**
		* The containers adjacent to the {@link #WINDOWING_MODE_SPLIT_SCREEN_PRIMARY} container in
		* split-screen mode.
		* NOTE: Containers launched with the windowing mode with APIs like
		* {@link ActivityOptions#setLaunchWindowingMode(int)} will be launched in
		* {@link #WINDOWING_MODE_FULLSCREEN} if the display isn't currently in split-screen windowing
		* mode
		*/
		// TODO: Remove once split-screen is migrated to wm-shell.
		public static final int WINDOWING_MODE_SPLIT_SCREEN_SECONDARY = 4;
		/** Can be freely resized within its parent container. */
		// TODO: Remove once freeform is migrated to wm-shell.
		public static final int WINDOWING_MODE_FREEFORM = 5;
		@@ -129,8 +116,6 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu
		WINDOWING_MODE_FULLSCREEN,
		WINDOWING_MODE_MULTI_WINDOW,
		WINDOWING_MODE_PINNED,
		WINDOWING_MODE_SPLIT_SCREEN_PRIMARY,
		WINDOWING_MODE_SPLIT_SCREEN_SECONDARY,
		WINDOWING_MODE_FREEFORM,
		})
		public @interface WindowingMode {}
		@@ -882,9 +867,8 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu
		}

		/**
		* Returns true if this container can be put in either
		* {@link #WINDOWING_MODE_SPLIT_SCREEN_PRIMARY} or
		* {@link #WINDOWING_MODE_SPLIT_SCREEN_SECONDARY} windowing modes based on its current state.
		* Returns true if this container can be put in {@link #WINDOWING_MODE_MULTI_WINDOW}
		* windowing mode based on its current state.
		* @hide
		*/
		public boolean supportSplitScreenWindowingMode() {
		@@ -903,8 +887,6 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu
		case WINDOWING_MODE_FULLSCREEN: return "fullscreen";
		case WINDOWING_MODE_MULTI_WINDOW: return "multi-window";
		case WINDOWING_MODE_PINNED: return "pinned";
		case WINDOWING_MODE_SPLIT_SCREEN_PRIMARY: return "split-screen-primary";
		case WINDOWING_MODE_SPLIT_SCREEN_SECONDARY: return "split-screen-secondary";
		case WINDOWING_MODE_FREEFORM: return "freeform";
		}
		return String.valueOf(windowingMode);

libs/WindowManager/Shell/src/com/android/wm/shell/ShellCommandHandlerImpl.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import com.android.wm.shell.apppairs.AppPairsController;
		import com.android.wm.shell.common.ShellExecutor;
		import com.android.wm.shell.hidedisplaycutout.HideDisplayCutoutController;
		import com.android.wm.shell.kidsmode.KidsModeTaskOrganizer;
		import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController;
		import com.android.wm.shell.onehanded.OneHandedController;
		import com.android.wm.shell.pip.Pip;
		import com.android.wm.shell.recents.RecentTasksController;
		@@ -39,7 +38,6 @@ import java.util.Optional;
		public final class ShellCommandHandlerImpl {
		private static final String TAG = ShellCommandHandlerImpl.class.getSimpleName();

		private final Optional<LegacySplitScreenController> mLegacySplitScreenOptional;
		private final Optional<SplitScreenController> mSplitScreenOptional;
		private final Optional<Pip> mPipOptional;
		private final Optional<OneHandedController> mOneHandedOptional;
		@@ -54,7 +52,6 @@ public final class ShellCommandHandlerImpl {
		public ShellCommandHandlerImpl(
		ShellTaskOrganizer shellTaskOrganizer,
		KidsModeTaskOrganizer kidsModeTaskOrganizer,
		Optional<LegacySplitScreenController> legacySplitScreenOptional,
		Optional<SplitScreenController> splitScreenOptional,
		Optional<Pip> pipOptional,
		Optional<OneHandedController> oneHandedOptional,
		@@ -65,7 +62,6 @@ public final class ShellCommandHandlerImpl {
		mShellTaskOrganizer = shellTaskOrganizer;
		mKidsModeTaskOrganizer = kidsModeTaskOrganizer;
		mRecentTasks = recentTasks;
		mLegacySplitScreenOptional = legacySplitScreenOptional;
		mSplitScreenOptional = splitScreenOptional;
		mPipOptional = pipOptional;
		mOneHandedOptional = oneHandedOptional;
		@@ -84,7 +80,6 @@ public final class ShellCommandHandlerImpl {
		pw.println();
		pw.println();
		mPipOptional.ifPresent(pip -> pip.dump(pw));
		mLegacySplitScreenOptional.ifPresent(splitScreen -> splitScreen.dump(pw));
		mOneHandedOptional.ifPresent(oneHanded -> oneHanded.dump(pw));
		mHideDisplayCutout.ifPresent(hideDisplayCutout -> hideDisplayCutout.dump(pw));
		pw.println();

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+2 −17

Original line number	Diff line number	Diff line
		@@ -70,8 +70,6 @@ import com.android.wm.shell.fullscreen.FullscreenUnfoldController;
		import com.android.wm.shell.hidedisplaycutout.HideDisplayCutout;
		import com.android.wm.shell.hidedisplaycutout.HideDisplayCutoutController;
		import com.android.wm.shell.kidsmode.KidsModeTaskOrganizer;
		import com.android.wm.shell.legacysplitscreen.LegacySplitScreen;
		import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController;
		import com.android.wm.shell.onehanded.OneHanded;
		import com.android.wm.shell.onehanded.OneHandedController;
		import com.android.wm.shell.pip.Pip;
		@@ -562,18 +560,6 @@ public abstract class WMShellBaseModule {
		return Optional.empty();
		}

		// Legacy split (optional feature)

		@WMSingleton
		@Provides
		static Optional<LegacySplitScreen> provideLegacySplitScreen(
		Optional<LegacySplitScreenController> splitScreenController) {
		return splitScreenController.map((controller) -> controller.asLegacySplitScreen());
		}

		@BindsOptionalOf
		abstract LegacySplitScreenController optionalLegacySplitScreenController();

		// App Pairs (optional feature)

		@WMSingleton
		@@ -710,7 +696,6 @@ public abstract class WMShellBaseModule {
		static ShellCommandHandlerImpl provideShellCommandHandlerImpl(
		ShellTaskOrganizer shellTaskOrganizer,
		KidsModeTaskOrganizer kidsModeTaskOrganizer,
		Optional<LegacySplitScreenController> legacySplitScreenOptional,
		Optional<SplitScreenController> splitScreenOptional,
		Optional<Pip> pipOptional,
		Optional<OneHandedController> oneHandedOptional,
		@@ -719,8 +704,8 @@ public abstract class WMShellBaseModule {
		Optional<RecentTasksController> recentTasksOptional,
		@ShellMainThread ShellExecutor mainExecutor) {
		return new ShellCommandHandlerImpl(shellTaskOrganizer, kidsModeTaskOrganizer,
		legacySplitScreenOptional, splitScreenOptional, pipOptional, oneHandedOptional,
		hideDisplayCutout, appPairsOptional, recentTasksOptional, mainExecutor);
		splitScreenOptional, pipOptional, oneHandedOptional, hideDisplayCutout,
		appPairsOptional, recentTasksOptional, mainExecutor);
		}

		@WMSingleton

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.wm.shell.dagger;

		import android.animation.AnimationHandler;
		import android.content.Context;
		import android.content.pm.LauncherApps;
		import android.os.Handler;
		@@ -42,12 +41,10 @@ import com.android.wm.shell.common.SyncTransactionQueue;
		import com.android.wm.shell.common.SystemWindows;
		import com.android.wm.shell.common.TaskStackListenerImpl;
		import com.android.wm.shell.common.TransactionPool;
		import com.android.wm.shell.common.annotations.ChoreographerSfVsync;
		import com.android.wm.shell.common.annotations.ShellMainThread;
		import com.android.wm.shell.draganddrop.DragAndDropController;
		import com.android.wm.shell.freeform.FreeformTaskListener;
		import com.android.wm.shell.fullscreen.FullscreenUnfoldController;
		import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController;
		import com.android.wm.shell.onehanded.OneHandedController;
		import com.android.wm.shell.pip.Pip;
		import com.android.wm.shell.pip.PipAnimationController;
		@@ -179,20 +176,6 @@ public class WMShellModule {
		recentTasks, stageTaskUnfoldControllerProvider);
		}

		@WMSingleton
		@Provides
		static LegacySplitScreenController provideLegacySplitScreen(Context context,
		DisplayController displayController, SystemWindows systemWindows,
		DisplayImeController displayImeController, TransactionPool transactionPool,
		ShellTaskOrganizer shellTaskOrganizer, SyncTransactionQueue syncQueue,
		TaskStackListenerImpl taskStackListener, Transitions transitions,
		@ShellMainThread ShellExecutor mainExecutor,
		@ChoreographerSfVsync AnimationHandler sfVsyncAnimationHandler) {
		return new LegacySplitScreenController(context, displayController, systemWindows,
		displayImeController, transactionPool, shellTaskOrganizer, syncQueue,
		taskStackListener, transitions, mainExecutor, sfVsyncAnimationHandler);
		}

		@WMSingleton
		@Provides
		static AppPairsController provideAppPairs(ShellTaskOrganizer shellTaskOrganizer,