Merge "Move SBTouchableRegion out of HeadsUpManagerPhone" (65ac9637) · Commits · e / os / android_frameworks_base

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -43,9 +43,11 @@ import com.android.systemui.statusbar.notification.NotificationInterruptionState
		import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.ShadeController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		import com.android.systemui.volume.CarVolumeDialogComponent;
		@@ -74,10 +76,14 @@ abstract class CarSystemUIModule {

		@Singleton
		@Provides
		static HeadsUpManagerPhone provideHeadsUpManagerPhone(Context context,
		static HeadsUpManagerPhone provideHeadsUpManagerPhone(
		Context context,
		StatusBarStateController statusBarStateController,
		KeyguardBypassController bypassController) {
		return new HeadsUpManagerPhone(context, statusBarStateController, bypassController);
		KeyguardBypassController bypassController,
		NotificationGroupManager groupManager,
		ConfigurationController configurationController) {
		return new HeadsUpManagerPhone(context, statusBarStateController, bypassController,
		groupManager, configurationController);
		}

		@Binds

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.StatusBarIconController;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.phone.StatusBarNotificationActivityStarter;
		import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager;
		import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		@@ -324,6 +325,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		ExtensionController extensionController,
		UserInfoControllerImpl userInfoControllerImpl,
		DismissCallbackRegistry dismissCallbackRegistry,
		StatusBarTouchableRegionManager statusBarTouchableRegionManager,
		/* Car Settings injected components. */
		CarServiceProvider carServiceProvider,
		Lazy<PowerManagerHelper> powerManagerHelperLazy,
		@@ -405,7 +407,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		keyguardDismissUtil,
		extensionController,
		userInfoControllerImpl,
		dismissCallbackRegistry);
		dismissCallbackRegistry,
		statusBarTouchableRegionManager);
		mUserSwitcherController = userSwitcherController;
		mScrimController = scrimController;
		mLockscreenLockIconController = lockscreenLockIconController;

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ import com.android.systemui.statusbar.phone.ShadeController;
		import com.android.systemui.statusbar.phone.StatusBarIconController;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.phone.StatusBarNotificationActivityStarter;
		import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager;
		import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;
		import com.android.systemui.statusbar.phone.dagger.StatusBarPhoneDependenciesModule;
		import com.android.systemui.statusbar.policy.BatteryController;
		@@ -197,6 +198,7 @@ public class CarStatusBarModule {
		ExtensionController extensionController,
		UserInfoControllerImpl userInfoControllerImpl,
		DismissCallbackRegistry dismissCallbackRegistry,
		StatusBarTouchableRegionManager statusBarTouchableRegionManager,
		CarServiceProvider carServiceProvider,
		Lazy<PowerManagerHelper> powerManagerHelperLazy,
		FullscreenUserSwitcher fullscreenUserSwitcher,
		@@ -277,6 +279,7 @@ public class CarStatusBarModule {
		extensionController,
		userInfoControllerImpl,
		dismissCallbackRegistry,
		statusBarTouchableRegionManager,
		carServiceProvider,
		powerManagerHelperLazy,
		fullscreenUserSwitcher,

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -38,8 +38,10 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.ShadeController;
		import com.android.systemui.statusbar.phone.ShadeControllerImpl;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedControllerImpl;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		@@ -92,10 +94,14 @@ public abstract class SystemUIDefaultModule {

		@Singleton
		@Provides
		static HeadsUpManagerPhone provideHeadsUpManagerPhone(Context context,
		static HeadsUpManagerPhone provideHeadsUpManagerPhone(
		Context context,
		StatusBarStateController statusBarStateController,
		KeyguardBypassController bypassController) {
		return new HeadsUpManagerPhone(context, statusBarStateController, bypassController);
		KeyguardBypassController bypassController,
		NotificationGroupManager groupManager,
		ConfigurationController configurationController) {
		return new HeadsUpManagerPhone(context, statusBarStateController, bypassController,
		groupManager, configurationController);
		}

		@Binds

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationAlertingManager.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -53,12 +53,14 @@ public class NotificationAlertingManager {
		VisualStabilityManager visualStabilityManager,
		StatusBarStateController statusBarStateController,
		NotificationInterruptionStateProvider notificationInterruptionStateProvider,
		NotificationListener notificationListener) {
		NotificationListener notificationListener,
		HeadsUpManager headsUpManager) {
		mRemoteInputManager = remoteInputManager;
		mVisualStabilityManager = visualStabilityManager;
		mStatusBarStateController = statusBarStateController;
		mNotificationInterruptionStateProvider = notificationInterruptionStateProvider;
		mNotificationListener = notificationListener;
		mHeadsUpManager = headsUpManager;

		notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {
		@Override
		@@ -81,10 +83,6 @@ public class NotificationAlertingManager {
		});
		}

		public void setHeadsUpManager(HeadsUpManager headsUpManager) {
		mHeadsUpManager = headsUpManager;
		}

		/**
		* Adds the entry to the respective alerting manager if the content view was inflated and
		* the entry should still alert.