Merge "Build StatusBar Controllers with a Subcomponent" (e9f384da) · Commits · e / os / android_frameworks_base

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

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -119,11 +119,11 @@ import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper
	import com.android.systemui.statusbar.phone.NotificationGroupManager;		import com.android.systemui.statusbar.phone.NotificationGroupManager;
	import com.android.systemui.statusbar.phone.ScrimController;		import com.android.systemui.statusbar.phone.ScrimController;
	import com.android.systemui.statusbar.phone.StatusBar;		import com.android.systemui.statusbar.phone.StatusBar;
			import com.android.systemui.statusbar.phone.StatusBarComponent;
	import com.android.systemui.statusbar.phone.StatusBarIconController;		import com.android.systemui.statusbar.phone.StatusBarIconController;
	import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
	import com.android.systemui.statusbar.phone.StatusBarNotificationActivityStarter;		import com.android.systemui.statusbar.phone.StatusBarNotificationActivityStarter;
	import com.android.systemui.statusbar.phone.StatusBarWindowController;		import com.android.systemui.statusbar.phone.StatusBarWindowController;
	import com.android.systemui.statusbar.phone.StatusBarWindowViewController;
	import com.android.systemui.statusbar.policy.BatteryController;		import com.android.systemui.statusbar.policy.BatteryController;
	import com.android.systemui.statusbar.policy.ConfigurationController;		import com.android.systemui.statusbar.policy.ConfigurationController;
	import com.android.systemui.statusbar.policy.DeviceProvisionedController;		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
	@@ -140,6 +140,7 @@ import java.util.Map;
	import java.util.Optional;		import java.util.Optional;

	import javax.inject.Named;		import javax.inject.Named;
			import javax.inject.Provider;

	import dagger.Lazy;		import dagger.Lazy;

	@@ -156,7 +157,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
	private static final float FLING_SPEED_UP_FACTOR = 0.6f;		private static final float FLING_SPEED_UP_FACTOR = 0.6f;

	private final ScrimController mScrimController;		private final ScrimController mScrimController;
	private final StatusBarWindowViewController mStatusBarWindowViewController;
	private final LockscreenLockIconController mLockscreenLockIconController;		private final LockscreenLockIconController mLockscreenLockIconController;

	private float mOpeningVelocity = DEFAULT_FLING_VELOCITY;		private float mOpeningVelocity = DEFAULT_FLING_VELOCITY;
	@@ -288,7 +288,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
	NotificationListener notificationListener,		NotificationListener notificationListener,
	ConfigurationController configurationController,		ConfigurationController configurationController,
	StatusBarWindowController statusBarWindowController,		StatusBarWindowController statusBarWindowController,
	StatusBarWindowViewController statusBarWindowViewController,
	LockscreenLockIconController lockscreenLockIconController,		LockscreenLockIconController lockscreenLockIconController,
	DozeParameters dozeParameters,		DozeParameters dozeParameters,
	ScrimController scrimController,		ScrimController scrimController,
	@@ -301,6 +300,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
	VolumeComponent volumeComponent,		VolumeComponent volumeComponent,
	CommandQueue commandQueue,		CommandQueue commandQueue,
	Optional<Recents> recents,		Optional<Recents> recents,
			Provider<StatusBarComponent.Builder> statusBarComponentBuilder,
	PluginManager pluginManager,		PluginManager pluginManager,
	RemoteInputUriController remoteInputUriController,		RemoteInputUriController remoteInputUriController,
	Optional<Divider> dividerOptional,		Optional<Divider> dividerOptional,
	@@ -366,7 +366,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
	notificationListener,		notificationListener,
	configurationController,		configurationController,
	statusBarWindowController,		statusBarWindowController,
	statusBarWindowViewController,
	lockscreenLockIconController,		lockscreenLockIconController,
	dozeParameters,		dozeParameters,
	scrimController,		scrimController,
	@@ -380,6 +379,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
	volumeComponent,		volumeComponent,
	commandQueue,		commandQueue,
	recents,		recents,
			statusBarComponentBuilder,
	pluginManager,		pluginManager,
	remoteInputUriController,		remoteInputUriController,
	dividerOptional,		dividerOptional,
	@@ -390,7 +390,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
	viewMediatorCallback,		viewMediatorCallback,
	dismissCallbackRegistry);		dismissCallbackRegistry);
	mScrimController = scrimController;		mScrimController = scrimController;
	mStatusBarWindowViewController = statusBarWindowViewController;
	mLockscreenLockIconController = lockscreenLockIconController;		mLockscreenLockIconController = lockscreenLockIconController;
	mDeviceProvisionedController = deviceProvisionedController;		mDeviceProvisionedController = deviceProvisionedController;
	mCarServiceProvider = carServiceProvider;		mCarServiceProvider = carServiceProvider;

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

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -78,11 +78,11 @@ import com.android.systemui.statusbar.phone.LockscreenWallpaper;
	import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper;		import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper;
	import com.android.systemui.statusbar.phone.NotificationGroupManager;		import com.android.systemui.statusbar.phone.NotificationGroupManager;
	import com.android.systemui.statusbar.phone.ScrimController;		import com.android.systemui.statusbar.phone.ScrimController;
			import com.android.systemui.statusbar.phone.StatusBarComponent;
	import com.android.systemui.statusbar.phone.StatusBarIconController;		import com.android.systemui.statusbar.phone.StatusBarIconController;
	import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
	import com.android.systemui.statusbar.phone.StatusBarNotificationActivityStarter;		import com.android.systemui.statusbar.phone.StatusBarNotificationActivityStarter;
	import com.android.systemui.statusbar.phone.StatusBarWindowController;		import com.android.systemui.statusbar.phone.StatusBarWindowController;
	import com.android.systemui.statusbar.phone.StatusBarWindowViewController;
	import com.android.systemui.statusbar.policy.BatteryController;		import com.android.systemui.statusbar.policy.BatteryController;
	import com.android.systemui.statusbar.policy.ConfigurationController;		import com.android.systemui.statusbar.policy.ConfigurationController;
	import com.android.systemui.statusbar.policy.DeviceProvisionedController;		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
	@@ -96,6 +96,7 @@ import com.android.systemui.volume.VolumeComponent;
	import java.util.Optional;		import java.util.Optional;

	import javax.inject.Named;		import javax.inject.Named;
			import javax.inject.Provider;
	import javax.inject.Singleton;		import javax.inject.Singleton;

	import dagger.Lazy;		import dagger.Lazy;
	@@ -162,7 +163,6 @@ public class CarStatusBarModule {
	NotificationListener notificationListener,		NotificationListener notificationListener,
	ConfigurationController configurationController,		ConfigurationController configurationController,
	StatusBarWindowController statusBarWindowController,		StatusBarWindowController statusBarWindowController,
	StatusBarWindowViewController statusBarWindowViewController,
	LockscreenLockIconController lockscreenLockIconController,		LockscreenLockIconController lockscreenLockIconController,
	DozeParameters dozeParameters,		DozeParameters dozeParameters,
	ScrimController scrimController,		ScrimController scrimController,
	@@ -175,6 +175,7 @@ public class CarStatusBarModule {
	VolumeComponent volumeComponent,		VolumeComponent volumeComponent,
	CommandQueue commandQueue,		CommandQueue commandQueue,
	Optional<Recents> recentsOptional,		Optional<Recents> recentsOptional,
			Provider<StatusBarComponent.Builder> statusBarComponentBuilder,
	PluginManager pluginManager,		PluginManager pluginManager,
	RemoteInputUriController remoteInputUriController,		RemoteInputUriController remoteInputUriController,
	Optional<Divider> dividerOptional,		Optional<Divider> dividerOptional,
	@@ -239,7 +240,6 @@ public class CarStatusBarModule {
	notificationListener,		notificationListener,
	configurationController,		configurationController,
	statusBarWindowController,		statusBarWindowController,
	statusBarWindowViewController,
	lockscreenLockIconController,		lockscreenLockIconController,
	dozeParameters,		dozeParameters,
	scrimController,		scrimController,
	@@ -252,6 +252,7 @@ public class CarStatusBarModule {
	volumeComponent,		volumeComponent,
	commandQueue,		commandQueue,
	recentsOptional,		recentsOptional,
			statusBarComponentBuilder,
	pluginManager,		pluginManager,
	remoteInputUriController,		remoteInputUriController,
	dividerOptional,		dividerOptional,

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ import com.android.systemui.statusbar.notification.collection.listbuilder.NotifL
	import com.android.systemui.statusbar.notification.people.PeopleHubModule;		import com.android.systemui.statusbar.notification.people.PeopleHubModule;
	import com.android.systemui.statusbar.phone.KeyguardLiftController;		import com.android.systemui.statusbar.phone.KeyguardLiftController;
	import com.android.systemui.statusbar.phone.StatusBar;		import com.android.systemui.statusbar.phone.StatusBar;
			import com.android.systemui.statusbar.phone.StatusBarComponent;
	import com.android.systemui.statusbar.policy.HeadsUpManager;		import com.android.systemui.statusbar.policy.HeadsUpManager;
	import com.android.systemui.util.sensors.AsyncSensorManager;		import com.android.systemui.util.sensors.AsyncSensorManager;
	import com.android.systemui.util.time.SystemClock;		import com.android.systemui.util.time.SystemClock;
	@@ -52,7 +53,8 @@ import dagger.Provides;
	* implementation.		* implementation.
	*/		*/
	@Module(includes = {AssistModule.class,		@Module(includes = {AssistModule.class,
	PeopleHubModule.class})		PeopleHubModule.class},
			subcomponents = {StatusBarComponent.class})
	public abstract class SystemUIModule {		public abstract class SystemUIModule {

	@Binds		@Binds

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@ import com.android.systemui.Dependency;
	import com.android.systemui.SystemUIAppComponentFactory;		import com.android.systemui.SystemUIAppComponentFactory;
	import com.android.systemui.SystemUIFactory;		import com.android.systemui.SystemUIFactory;
	import com.android.systemui.fragments.FragmentService;		import com.android.systemui.fragments.FragmentService;
	import com.android.systemui.statusbar.phone.StatusBar;
	import com.android.systemui.statusbar.policy.ConfigurationController;		import com.android.systemui.statusbar.policy.ConfigurationController;
	import com.android.systemui.util.InjectionInflationController;		import com.android.systemui.util.InjectionInflationController;

	@@ -72,12 +71,6 @@ public interface SystemUIRootComponent {
	@Singleton		@Singleton
	Dependency.DependencyInjector createDependency();		Dependency.DependencyInjector createDependency();

	/**
	* Injects the StatusBar.
	*/
	@Singleton
	StatusBar.StatusBarInjector getStatusBarInjector();

	/**		/**
	* FragmentCreator generates all Fragments that need injection.		* FragmentCreator generates all Fragments that need injection.
	*/		*/

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -88,10 +88,9 @@ public final class DozeServiceHost implements DozeHost {
	private final PulseExpansionHandler mPulseExpansionHandler;		private final PulseExpansionHandler mPulseExpansionHandler;
	private final StatusBarWindowController mStatusBarWindowController;		private final StatusBarWindowController mStatusBarWindowController;
	private final NotificationWakeUpCoordinator mNotificationWakeUpCoordinator;		private final NotificationWakeUpCoordinator mNotificationWakeUpCoordinator;
	private final StatusBarWindowViewController mStatusBarWindowViewController;		private StatusBarWindowViewController mStatusBarWindowViewController;
	private final LockscreenLockIconController mLockscreenLockIconController;		private final LockscreenLockIconController mLockscreenLockIconController;
	private NotificationIconAreaController mNotificationIconAreaController;		private NotificationIconAreaController mNotificationIconAreaController;
	private StatusBarWindowView mStatusBarWindow;
	private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;		private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
	private NotificationPanelView mNotificationPanel;		private NotificationPanelView mNotificationPanel;
	private View mAmbientIndicationContainer;		private View mAmbientIndicationContainer;
	@@ -112,7 +111,6 @@ public final class DozeServiceHost implements DozeHost {
	PulseExpansionHandler pulseExpansionHandler,		PulseExpansionHandler pulseExpansionHandler,
	StatusBarWindowController statusBarWindowController,		StatusBarWindowController statusBarWindowController,
	NotificationWakeUpCoordinator notificationWakeUpCoordinator,		NotificationWakeUpCoordinator notificationWakeUpCoordinator,
	StatusBarWindowViewController statusBarWindowViewController,
	LockscreenLockIconController lockscreenLockIconController) {		LockscreenLockIconController lockscreenLockIconController) {
	super();		super();
	mDozeLog = dozeLog;		mDozeLog = dozeLog;
	@@ -132,7 +130,6 @@ public final class DozeServiceHost implements DozeHost {
	mPulseExpansionHandler = pulseExpansionHandler;		mPulseExpansionHandler = pulseExpansionHandler;
	mStatusBarWindowController = statusBarWindowController;		mStatusBarWindowController = statusBarWindowController;
	mNotificationWakeUpCoordinator = notificationWakeUpCoordinator;		mNotificationWakeUpCoordinator = notificationWakeUpCoordinator;
	mStatusBarWindowViewController = statusBarWindowViewController;
	mLockscreenLockIconController = lockscreenLockIconController;		mLockscreenLockIconController = lockscreenLockIconController;
	}		}

	@@ -143,14 +140,14 @@ public final class DozeServiceHost implements DozeHost {
	*/		*/
	public void initialize(StatusBar statusBar,		public void initialize(StatusBar statusBar,
	NotificationIconAreaController notificationIconAreaController,		NotificationIconAreaController notificationIconAreaController,
	StatusBarWindowView statusBarWindow,
	StatusBarKeyguardViewManager statusBarKeyguardViewManager,		StatusBarKeyguardViewManager statusBarKeyguardViewManager,
			StatusBarWindowViewController statusBarWindowViewController,
	NotificationPanelView notificationPanel, View ambientIndicationContainer) {		NotificationPanelView notificationPanel, View ambientIndicationContainer) {
	mStatusBar = statusBar;		mStatusBar = statusBar;
	mNotificationIconAreaController = notificationIconAreaController;		mNotificationIconAreaController = notificationIconAreaController;
	mStatusBarWindow = statusBarWindow;
	mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;		mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;
	mNotificationPanel = notificationPanel;		mNotificationPanel = notificationPanel;