Merge "1/ Remove extraneous BubbleController create method" into tm-qpr-dev (9ccf7960) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+2 −39

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ import androidx.annotation.MainThread;
		import androidx.annotation.Nullable;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.logging.UiEventLogger;
		import com.android.internal.statusbar.IStatusBarService;
		import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.TaskViewTransitions;
		@@ -223,44 +222,8 @@ public class BubbleController {
		/** Drag and drop controller to register listener for onDragStarted. */
		private DragAndDropController mDragAndDropController;

		/**
		* Creates an instance of the BubbleController.
		*/
		public static BubbleController create(Context context,
		@Nullable BubbleStackView.SurfaceSynchronizer synchronizer,
		FloatingContentCoordinator floatingContentCoordinator,
		@Nullable IStatusBarService statusBarService,
		WindowManager windowManager,
		WindowManagerShellWrapper windowManagerShellWrapper,
		UserManager userManager,
		LauncherApps launcherApps,
		TaskStackListenerImpl taskStackListener,
		UiEventLogger uiEventLogger,
		ShellTaskOrganizer organizer,
		DisplayController displayController,
		Optional<OneHandedController> oneHandedOptional,
		DragAndDropController dragAndDropController,
		@ShellMainThread ShellExecutor mainExecutor,
		@ShellMainThread Handler mainHandler,
		@ShellBackgroundThread ShellExecutor bgExecutor,
		TaskViewTransitions taskViewTransitions,
		SyncTransactionQueue syncQueue) {
		BubbleLogger logger = new BubbleLogger(uiEventLogger);
		BubblePositioner positioner = new BubblePositioner(context, windowManager);
		BubbleData data = new BubbleData(context, logger, positioner, mainExecutor);
		return new BubbleController(context, data, synchronizer, floatingContentCoordinator,
		new BubbleDataRepository(context, launcherApps, mainExecutor),
		statusBarService, windowManager, windowManagerShellWrapper, userManager,
		launcherApps, logger, taskStackListener, organizer, positioner, displayController,
		oneHandedOptional, dragAndDropController, mainExecutor, mainHandler, bgExecutor,
		taskViewTransitions, syncQueue);
		}

		/**
		* Testing constructor.
		*/
		@VisibleForTesting
		protected BubbleController(Context context,
		public BubbleController(Context context,
		BubbleData data,
		@Nullable BubbleStackView.SurfaceSynchronizer synchronizer,
		FloatingContentCoordinator floatingContentCoordinator,

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

+35 −6

Original line number	Diff line number	Diff line
		@@ -31,6 +31,10 @@ import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.TaskViewTransitions;
		import com.android.wm.shell.WindowManagerShellWrapper;
		import com.android.wm.shell.bubbles.BubbleController;
		import com.android.wm.shell.bubbles.BubbleData;
		import com.android.wm.shell.bubbles.BubbleDataRepository;
		import com.android.wm.shell.bubbles.BubbleLogger;
		import com.android.wm.shell.bubbles.BubblePositioner;
		import com.android.wm.shell.common.DisplayController;
		import com.android.wm.shell.common.DisplayImeController;
		import com.android.wm.shell.common.DisplayInsetsController;
		@@ -104,10 +108,33 @@ public abstract class WMShellModule {
		// Bubbles
		//

		@WMSingleton
		@Provides
		static BubbleLogger provideBubbleLogger(UiEventLogger uiEventLogger) {
		return new BubbleLogger(uiEventLogger);
		}

		@WMSingleton
		@Provides
		static BubblePositioner provideBubblePositioner(Context context,
		WindowManager windowManager) {
		return new BubblePositioner(context, windowManager);
		}

		@WMSingleton
		@Provides
		static BubbleData provideBubbleData(Context context,
		BubbleLogger logger,
		BubblePositioner positioner,
		@ShellMainThread ShellExecutor mainExecutor) {
		return new BubbleData(context, logger, positioner, mainExecutor);
		}

		// Note: Handler needed for LauncherApps.register
		@WMSingleton
		@Provides
		static BubbleController provideBubbleController(Context context,
		BubbleData data,
		FloatingContentCoordinator floatingContentCoordinator,
		IStatusBarService statusBarService,
		WindowManager windowManager,
		@@ -115,8 +142,9 @@ public abstract class WMShellModule {
		UserManager userManager,
		LauncherApps launcherApps,
		TaskStackListenerImpl taskStackListener,
		UiEventLogger uiEventLogger,
		BubbleLogger logger,
		ShellTaskOrganizer organizer,
		BubblePositioner positioner,
		DisplayController displayController,
		@DynamicOverride Optional<OneHandedController> oneHandedOptional,
		DragAndDropController dragAndDropController,
		@@ -125,11 +153,12 @@ public abstract class WMShellModule {
		@ShellBackgroundThread ShellExecutor bgExecutor,
		TaskViewTransitions taskViewTransitions,
		SyncTransactionQueue syncQueue) {
		return BubbleController.create(context, null /* synchronizer */,
		floatingContentCoordinator, statusBarService, windowManager,
		windowManagerShellWrapper, userManager, launcherApps, taskStackListener,
		uiEventLogger, organizer, displayController, oneHandedOptional,
		dragAndDropController, mainExecutor, mainHandler, bgExecutor,
		return new BubbleController(context, data, null /* synchronizer */,
		floatingContentCoordinator,
		new BubbleDataRepository(context, launcherApps, mainExecutor),
		statusBarService, windowManager, windowManagerShellWrapper, userManager,
		launcherApps, logger, taskStackListener, organizer, positioner, displayController,
		oneHandedOptional, dragAndDropController, mainExecutor, mainHandler, bgExecutor,
		taskViewTransitions, syncQueue);
		}