Merge "Remove all calls to getComponent(CommandQueue.class)." (f6247cf3) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/res/values/config.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@
		<!-- SystemUI Services: The classes of the stuff to start. -->
		<string-array name="config_systemUIServiceComponents" translatable="false">
		<item>com.android.systemui.util.NotificationChannels</item>
		<item>com.android.systemui.statusbar.CommandQueue$CommandQueueStart</item>
		<item>com.android.systemui.keyguard.KeyguardViewMediator</item>
		<item>com.android.systemui.recents.Recents</item>
		<item>com.android.systemui.volume.VolumeUI</item>

packages/CarSystemUI/src/com/android/systemui/CarSystemUIBinder.java

+38 −0

Original line number	Diff line number	Diff line
		@@ -26,10 +26,12 @@ import com.android.internal.logging.MetricsLogger;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.systemui.appops.AppOpsController;
		import com.android.systemui.assist.AssistManager;
		import com.android.systemui.biometrics.AuthController;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.bubbles.BubbleController;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.doze.DozeLog;
		import com.android.systemui.globalactions.GlobalActionsComponent;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		import com.android.systemui.keyguard.ScreenLifecycle;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		@@ -40,6 +42,7 @@ import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.power.PowerUI;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.RecentsModule;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.statusbar.NavigationBarController;
		import com.android.systemui.statusbar.NotificationListener;
		@@ -53,6 +56,7 @@ import com.android.systemui.statusbar.VibratorHelper;
		import com.android.systemui.statusbar.car.CarStatusBar;
		import com.android.systemui.statusbar.notification.BypassHeadsUpNotifier;
		import com.android.systemui.statusbar.notification.DynamicPrivacyController;
		import com.android.systemui.statusbar.notification.InstantAppNotifier;
		import com.android.systemui.statusbar.notification.NewNotifPipeline;
		import com.android.systemui.statusbar.notification.NotificationAlertingManager;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		@@ -86,6 +90,7 @@ import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
		import com.android.systemui.statusbar.policy.UserSwitcherController;
		import com.android.systemui.statusbar.policy.ZenModeController;
		import com.android.systemui.statusbar.tv.TvStatusBar;
		import com.android.systemui.util.InjectionInflationController;
		import com.android.systemui.util.leak.GarbageMonitor;
		import com.android.systemui.volume.VolumeUI;
		@@ -103,6 +108,12 @@ import dagger.multibindings.IntoMap;
		/** Binder for car specific {@link SystemUI} modules. */
		@Module(includes = {RecentsModule.class})
		public abstract class CarSystemUIBinder {
		/** Inject into AuthController. */
		@Binds
		@IntoMap
		@ClassKey(AuthController.class)
		public abstract SystemUI bindAuthController(AuthController service);

		/** */
		@Binds
		@IntoMap
		@@ -115,6 +126,18 @@ public abstract class CarSystemUIBinder {
		@ClassKey(GarbageMonitor.Service.class)
		public abstract SystemUI bindGarbageMonitorService(GarbageMonitor.Service service);

		/** Inject into GlobalActionsComponent. */
		@Binds
		@IntoMap
		@ClassKey(GlobalActionsComponent.class)
		public abstract SystemUI bindGlobalActionsComponent(GlobalActionsComponent sysui);

		/** Inject into InstantAppNotifier. */
		@Binds
		@IntoMap
		@ClassKey(InstantAppNotifier.class)
		public abstract SystemUI bindInstantAppNotifier(InstantAppNotifier sysui);

		/** Inject into KeyguardViewMediator. */
		@Binds
		@IntoMap
		@@ -151,12 +174,25 @@ public abstract class CarSystemUIBinder {
		@ClassKey(ScreenDecorations.class)
		public abstract SystemUI bindScreenDecorations(ScreenDecorations sysui);

		/** Inject into SizeCompatModeActivityController. */
		@Binds
		@IntoMap
		@ClassKey(SizeCompatModeActivityController.class)
		public abstract SystemUI bindsSizeCompatModeActivityController(
		SizeCompatModeActivityController sysui);

		/** Inject into StatusBar. */
		@Binds
		@IntoMap
		@ClassKey(StatusBar.class)
		public abstract SystemUI bindsStatusBar(CarStatusBar sysui);

		/** Inject into TvStatusBar. */
		@Binds
		@IntoMap
		@ClassKey(TvStatusBar.class)
		public abstract SystemUI bindsTvStatusBar(TvStatusBar sysui);

		/** Inject into StatusBarGoogle. */
		@Binds
		@IntoMap
		@@ -238,6 +274,7 @@ public abstract class CarSystemUIBinder {
		DozeServiceHost dozeServiceHost,
		PowerManager powerManager,
		DozeScrimController dozeScrimController,
		CommandQueue commandQueue,
		CarNavigationBarController carNavigationBarController) {
		return new CarStatusBar(
		context,
		@@ -303,6 +340,7 @@ public abstract class CarSystemUIBinder {
		dozeServiceHost,
		powerManager,
		dozeScrimController,
		commandQueue,
		carNavigationBarController);
		}
		}

packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBarView.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.widget.LinearLayout;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.navigationbar.car.CarNavigationBarController.NotificationsShadeController;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.phone.StatusBarIconController;

		/**
		@@ -63,7 +64,8 @@ public class CarNavigationBarView extends LinearLayout {
		// container is in the view.
		StatusBarIconController.DarkIconManager mDarkIconManager =
		new StatusBarIconController.DarkIconManager(
		mStatusIcons.findViewById(R.id.statusIcons));
		mStatusIcons.findViewById(R.id.statusIcons),
		Dependency.get(CommandQueue.class));
		mDarkIconManager.setShouldLog(true);
		Dependency.get(StatusBarIconController.class).addIconGroup(mDarkIconManager);
		}

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ import com.android.systemui.navigationbar.car.CarNavigationBarView;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.qs.QS;
		import com.android.systemui.qs.car.CarQSFragment;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.statusbar.FlingAnimationUtils;
		import com.android.systemui.statusbar.NavigationBarController;
		@@ -297,7 +298,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		DozeServiceHost dozeServiceHost,
		PowerManager powerManager,
		DozeScrimController dozeScrimController,

		CommandQueue commandQueue,
		/* Car Settings injected components. */
		CarNavigationBarController carNavigationBarController) {
		super(
		@@ -364,7 +365,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		biometricUnlockControllerLazy,
		dozeServiceHost,
		powerManager,
		dozeScrimController);
		dozeScrimController,
		commandQueue);
		mScrimController = scrimController;
		mCarNavigationBarController = carNavigationBarController;
		}

packages/SystemUI/README.md

+0 −5

Original line number	Diff line number	Diff line
		@@ -80,11 +80,6 @@ Provides custom dependency injection.

		Creates/initializes the channels sysui uses when posting notifications.

		### [com.android.systemui.statusbar.CommandQueue$CommandQueueStart](/packages/SystemUI/src/com/android/systemui/sstatusbar/CommandQueue.java)

		Creates CommandQueue and calls putComponent because its always been there
		and sysui expects it to be there :/

		### [com.android.systemui.keyguard.KeyguardViewMediator](/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java)

		Manages keyguard view state.