Merge "Move kids task organizer to handheld package" into tm-qpr-dev (da1e890f) · Commits · e / os / android_frameworks_base

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

+0 −21

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ import com.android.wm.shell.floating.FloatingTasksController;
		import com.android.wm.shell.freeform.FreeformComponents;
		import com.android.wm.shell.fullscreen.FullscreenTaskListener;
		import com.android.wm.shell.hidedisplaycutout.HideDisplayCutoutController;
		import com.android.wm.shell.kidsmode.KidsModeTaskOrganizer;
		import com.android.wm.shell.onehanded.OneHanded;
		import com.android.wm.shell.onehanded.OneHandedController;
		import com.android.wm.shell.pip.Pip;
		@@ -190,25 +189,6 @@ public abstract class WMShellBaseModule {
		unfoldAnimationController, recentTasksOptional, mainExecutor);
		}

		@WMSingleton
		@Provides
		static KidsModeTaskOrganizer provideKidsModeTaskOrganizer(
		Context context,
		ShellInit shellInit,
		ShellCommandHandler shellCommandHandler,
		SyncTransactionQueue syncTransactionQueue,
		DisplayController displayController,
		DisplayInsetsController displayInsetsController,
		Optional<UnfoldAnimationController> unfoldAnimationController,
		Optional<RecentTasksController> recentTasksOptional,
		@ShellMainThread ShellExecutor mainExecutor,
		@ShellMainThread Handler mainHandler
		) {
		return new KidsModeTaskOrganizer(context, shellInit, shellCommandHandler,
		syncTransactionQueue, displayController, displayInsetsController,
		unfoldAnimationController, recentTasksOptional, mainExecutor, mainHandler);
		}

		@WMSingleton
		@Provides
		static CompatUIController provideCompatUIController(Context context,
		@@ -781,7 +761,6 @@ public abstract class WMShellBaseModule {
		DisplayInsetsController displayInsetsController,
		DragAndDropController dragAndDropController,
		ShellTaskOrganizer shellTaskOrganizer,
		KidsModeTaskOrganizer kidsModeTaskOrganizer,
		Optional<BubbleController> bubblesOptional,
		Optional<SplitScreenController> splitScreenOptional,
		Optional<Pip> pipOptional,

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import com.android.wm.shell.freeform.FreeformTaskListener;
		import com.android.wm.shell.freeform.FreeformTaskTransitionHandler;
		import com.android.wm.shell.freeform.FreeformTaskTransitionObserver;
		import com.android.wm.shell.fullscreen.FullscreenTaskListener;
		import com.android.wm.shell.kidsmode.KidsModeTaskOrganizer;
		import com.android.wm.shell.onehanded.OneHandedController;
		import com.android.wm.shell.pip.Pip;
		import com.android.wm.shell.pip.PipAnimationController;
		@@ -619,6 +620,28 @@ public abstract class WMShellModule {
		return new DesktopModeTaskRepository();
		}

		//
		// Kids mode
		//
		@WMSingleton
		@Provides
		static KidsModeTaskOrganizer provideKidsModeTaskOrganizer(
		Context context,
		ShellInit shellInit,
		ShellCommandHandler shellCommandHandler,
		SyncTransactionQueue syncTransactionQueue,
		DisplayController displayController,
		DisplayInsetsController displayInsetsController,
		Optional<UnfoldAnimationController> unfoldAnimationController,
		Optional<RecentTasksController> recentTasksOptional,
		@ShellMainThread ShellExecutor mainExecutor,
		@ShellMainThread Handler mainHandler
		) {
		return new KidsModeTaskOrganizer(context, shellInit, shellCommandHandler,
		syncTransactionQueue, displayController, displayInsetsController,
		unfoldAnimationController, recentTasksOptional, mainExecutor, mainHandler);
		}

		//
		// Misc
		//
		@@ -630,6 +653,7 @@ public abstract class WMShellModule {
		@Provides
		static Object provideIndependentShellComponentsToCreate(
		DefaultMixedHandler defaultMixedHandler,
		KidsModeTaskOrganizer kidsModeTaskOrganizer,
		Optional<DesktopModeController> desktopModeController) {
		return new Object();
		}