Merge "Inline SystemCoreStartableModule includes" into main (612e550d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dagger/DefaultComponentBinder.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -19,10 +19,14 @@ package com.android.systemui.dagger;
		import dagger.Module;

		/**
		* Dagger Module that collects related sub-modules together.
		* DEPRECATED: DO NOT ADD THINGS TO THIS FILE. b/427499553
		*
		* See {@link ContextComponentResolver}
		*
		* @deprecated b/427499553
		*/

		@Deprecated()
		@Module(includes = {DefaultActivityBinder.class,
		DefaultBroadcastReceiverBinder.class,
		DefaultServiceBinder.class})

packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,9 @@ import com.android.systemui.util.leak.LeakModule;
		import dagger.Module;

		/**
		* @deprecated This module is going away. Don't put anything in here.
		* DEPRECATED: DO NOT ADD THINGS TO THIS FILE. b/427499553
		*
		* @deprecated b/427499553
		*/
		@Deprecated
		@Module(includes = {

packages/SystemUI/src/com/android/systemui/dagger/ReferenceSysUIComponent.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -16,10 +16,14 @@

		package com.android.systemui.dagger;

		import com.android.systemui.controls.dagger.StartControlsStartableModule;
		import com.android.systemui.keyguard.CustomizationProvider;
		import com.android.systemui.settings.MultiUserUtilsModule;
		import com.android.systemui.statusbar.NotificationInsetsModule;
		import com.android.systemui.statusbar.QsFrameTranslateModule;
		import com.android.systemui.unfold.SysUIUnfoldModule;
		import com.android.systemui.util.StartBinderLoggerModule;
		import com.android.systemui.wallpapers.dagger.WallpaperModule;

		import dagger.Subcomponent;

		@@ -30,12 +34,16 @@ import dagger.Subcomponent;
		@Subcomponent(modules = {
		DefaultComponentBinder.class,
		DependencyProvider.class,
		MultiUserUtilsModule.class,
		NotificationInsetsModule.class,
		QsFrameTranslateModule.class,
		ReferenceSystemUIModule.class,
		StartControlsStartableModule.class,
		StartBinderLoggerModule.class,
		SystemUIModule.class,
		SystemUICoreStartableModule.class,
		SysUIUnfoldModule.class,
		ReferenceSystemUIModule.class})
		WallpaperModule.class})
		public interface ReferenceSysUIComponent extends SysUIComponent {

		/**

packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java

+15 −4

Original line number	Diff line number	Diff line
		@@ -21,16 +21,20 @@ import com.android.systemui.CoreStartable;
		import com.android.systemui.Dependency;
		import com.android.systemui.InitController;
		import com.android.systemui.SystemUIAppComponentFactoryBase;
		import com.android.systemui.controls.dagger.StartControlsStartableModule;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dagger.qualifiers.PerUser;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.keyguard.KeyguardSliceProvider;
		import com.android.systemui.people.PeopleProvider;
		import com.android.systemui.settings.MultiUserUtilsModule;
		import com.android.systemui.startable.Dependencies;
		import com.android.systemui.statusbar.NotificationInsetsModule;
		import com.android.systemui.statusbar.QsFrameTranslateModule;
		import com.android.systemui.statusbar.phone.ConfigurationForwarder;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.util.StartBinderLoggerModule;
		import com.android.systemui.wallpapers.dagger.WallpaperModule;
		import com.android.wm.shell.appzoomout.AppZoomOut;
		import com.android.wm.shell.back.BackAnimation;
		import com.android.wm.shell.bubbles.Bubbles;
		@@ -57,19 +61,26 @@ import java.util.Set;
		import javax.inject.Provider;

		/**
		* An example Dagger Subcomponent for Core SysUI.
		* <p>
		* See {@link ReferenceSysUIComponent} for the one actually used by AOSP.
		* A base Dagger Subcomponent for Core SysUI.
		*
		* Do not use this directly. Instead, extend it for your own variant's implementation. You will
		* need to copy the included modules.
		*
		* See {@link ReferenceSysUIComponent} for a working example, as used in AOSP.
		*/
		@SysUISingleton
		@Subcomponent(modules = {
		DefaultComponentBinder.class,
		DependencyProvider.class,
		MultiUserUtilsModule.class,
		NotificationInsetsModule.class,
		QsFrameTranslateModule.class,
		ReferenceSystemUIModule.class,
		StartControlsStartableModule.class,
		StartBinderLoggerModule.class,
		SystemUIModule.class,
		SystemUICoreStartableModule.class,
		ReferenceSystemUIModule.class})
		WallpaperModule.class})
		public interface SysUIComponent {

		/**

packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

+4 −15

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import com.android.systemui.bouncer.domain.startable.BouncerStartable
		import com.android.systemui.clipboardoverlay.ClipboardListener
		import com.android.systemui.complication.ComplicationTypesUpdater
		import com.android.systemui.complication.DreamClockTimeComplication
		import com.android.systemui.controls.dagger.StartControlsStartableModule
		import com.android.systemui.dagger.qualifiers.PerUser
		import com.android.systemui.dreams.AssistantAttentionMonitor
		import com.android.systemui.dreams.DreamMonitor
		@@ -50,7 +49,6 @@ import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper
		import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver
		import com.android.systemui.media.taptotransfer.sender.MediaTttSenderCoordinator
		import com.android.systemui.mediaprojection.taskswitcher.MediaProjectionTaskSwitcherCoreStartable
		import com.android.systemui.settings.MultiUserUtilsModule
		import com.android.systemui.shortcut.ShortcutKeyDispatcher
		import com.android.systemui.statusbar.ImmersiveModeConfirmation
		import com.android.systemui.statusbar.gesture.GesturePointerEventListener
		@@ -62,8 +60,6 @@ import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator
		import com.android.systemui.theme.ThemeOverlayController
		import com.android.systemui.usb.StorageNotification
		import com.android.systemui.util.NotificationChannels
		import com.android.systemui.util.StartBinderLoggerModule
		import com.android.systemui.wallpapers.dagger.WallpaperModule
		import com.android.systemui.wmshell.WMShell
		import dagger.Binds
		import dagger.Module
		@@ -71,22 +67,15 @@ import dagger.multibindings.ClassKey
		import dagger.multibindings.IntoMap

		/**
		* DEPRECATED: DO NOT ADD THINGS TO THIS FILE.
		* DEPRECATED: DO NOT ADD THINGS TO THIS FILE. b/427499553
		*
		* Add a feature specific daggger module for what you are working on. Bind your CoreStartable there.
		* Include that module where it is needed.
		*
		* @deprecated
		* @deprecated b/427499553
		*/
		@Module(
		includes =
		[
		MultiUserUtilsModule::class,
		StartControlsStartableModule::class,
		StartBinderLoggerModule::class,
		WallpaperModule::class,
		]
		)
		@Deprecated("Do not add things to this file.")
		@Module()
		abstract class SystemUICoreStartableModule {
		/** Inject into BiometricNotificationService */
		@Binds