Merge "Some StatusBar cleanup" (427a9236) · Commits · e / os / android_frameworks_base

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

+0 −15

Original line number	Diff line number	Diff line
		@@ -58,18 +58,15 @@ import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.systemui.BatteryMeterView;
		import com.android.systemui.CarSystemUIFactory;
		import com.android.systemui.Dependency;
		import com.android.systemui.ForegroundServiceController;
		import com.android.systemui.Prefs;
		import com.android.systemui.R;
		import com.android.systemui.SystemUIFactory;
		import com.android.systemui.UiOffloadThread;
		import com.android.systemui.appops.AppOpsController;
		import com.android.systemui.assist.AssistManager;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.bubbles.BubbleController;
		import com.android.systemui.classifier.FalsingLog;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.doze.DozeLog;
		import com.android.systemui.fragments.FragmentHostManager;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		import com.android.systemui.keyguard.ScreenLifecycle;
		@@ -104,7 +101,6 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
		import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
		import com.android.systemui.statusbar.notification.VisualStabilityManager;
		import com.android.systemui.statusbar.notification.logging.NotifLog;
		import com.android.systemui.statusbar.notification.logging.NotificationLogger;
		import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
		import com.android.systemui.statusbar.phone.AutoHideController;
		@@ -133,7 +129,6 @@ import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
		import com.android.systemui.statusbar.policy.RemoteInputUriController;
		import com.android.systemui.statusbar.policy.UserSwitcherController;
		import com.android.systemui.statusbar.policy.ZenModeController;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -246,7 +241,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		AutoHideController autoHideController,
		KeyguardUpdateMonitor keyguardUpdateMonitor,
		StatusBarIconController statusBarIconController,
		DozeLog dozeLog,
		PulseExpansionHandler pulseExpansionHandler,
		NotificationWakeUpCoordinator notificationWakeUpCoordinator,
		KeyguardBypassController keyguardBypassController,
		@@ -264,10 +258,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		NotificationEntryManager notificationEntryManager,
		NotificationInterruptionStateProvider notificationInterruptionStateProvider,
		NotificationViewHierarchyManager notificationViewHierarchyManager,
		ForegroundServiceController foregroundServiceController,
		AppOpsController appOpsController,
		KeyguardViewMediator keyguardViewMediator,
		ZenModeController zenModeController,
		NotificationAlertingManager notificationAlertingManager,
		DisplayMetrics displayMetrics,
		MetricsLogger metricsLogger,
		@@ -294,7 +285,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		ConfigurationController configurationController,
		StatusBarWindowController statusBarWindowController,
		StatusBarWindowViewController.Builder statusBarWindowViewControllerBuild,
		NotifLog notifLog,
		DozeParameters dozeParameters,
		ScrimController scrimController,
		Lazy<LockscreenWallpaper> lockscreenWallpaperLazy,
		@@ -317,7 +307,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		autoHideController,
		keyguardUpdateMonitor,
		statusBarIconController,
		dozeLog,
		pulseExpansionHandler,
		notificationWakeUpCoordinator,
		keyguardBypassController,
		@@ -335,10 +324,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		notificationEntryManager,
		notificationInterruptionStateProvider,
		notificationViewHierarchyManager,
		foregroundServiceController,
		appOpsController,
		keyguardViewMediator,
		zenModeController,
		notificationAlertingManager,
		displayMetrics,
		metricsLogger,
		@@ -365,7 +351,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		configurationController,
		statusBarWindowController,
		statusBarWindowViewControllerBuild,
		notifLog,
		dozeParameters,
		scrimController,
		null /* keyguardLiftController */,

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

+0 −15

Original line number	Diff line number	Diff line
		@@ -24,14 +24,11 @@ import android.util.DisplayMetrics;

		import com.android.internal.logging.MetricsLogger;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.systemui.ForegroundServiceController;
		import com.android.systemui.UiOffloadThread;
		import com.android.systemui.appops.AppOpsController;
		import com.android.systemui.assist.AssistManager;
		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.keyguard.KeyguardViewMediator;
		import com.android.systemui.keyguard.ScreenLifecycle;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		@@ -60,7 +57,6 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
		import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
		import com.android.systemui.statusbar.notification.VisualStabilityManager;
		import com.android.systemui.statusbar.notification.logging.NotifLog;
		import com.android.systemui.statusbar.notification.logging.NotificationLogger;
		import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
		import com.android.systemui.statusbar.phone.AutoHideController;
		@@ -87,7 +83,6 @@ import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
		import com.android.systemui.statusbar.policy.RemoteInputUriController;
		import com.android.systemui.statusbar.policy.UserSwitcherController;
		import com.android.systemui.statusbar.policy.ZenModeController;

		import java.util.Optional;

		@@ -115,7 +110,6 @@ public class CarStatusBarModule {
		AutoHideController autoHideController,
		KeyguardUpdateMonitor keyguardUpdateMonitor,
		StatusBarIconController statusBarIconController,
		DozeLog dozeLog,
		PulseExpansionHandler pulseExpansionHandler,
		NotificationWakeUpCoordinator notificationWakeUpCoordinator,
		KeyguardBypassController keyguardBypassController,
		@@ -133,10 +127,7 @@ public class CarStatusBarModule {
		NotificationEntryManager notificationEntryManager,
		NotificationInterruptionStateProvider notificationInterruptionStateProvider,
		NotificationViewHierarchyManager notificationViewHierarchyManager,
		ForegroundServiceController foregroundServiceController,
		AppOpsController appOpsController,
		KeyguardViewMediator keyguardViewMediator,
		ZenModeController zenModeController,
		NotificationAlertingManager notificationAlertingManager,
		DisplayMetrics displayMetrics,
		MetricsLogger metricsLogger,
		@@ -163,7 +154,6 @@ public class CarStatusBarModule {
		ConfigurationController configurationController,
		StatusBarWindowController statusBarWindowController,
		StatusBarWindowViewController.Builder statusBarWindowViewControllerBuilder,
		NotifLog notifLog,
		DozeParameters dozeParameters,
		ScrimController scrimController,
		Lazy<LockscreenWallpaper> lockscreenWallpaperLazy,
		@@ -185,7 +175,6 @@ public class CarStatusBarModule {
		autoHideController,
		keyguardUpdateMonitor,
		statusBarIconController,
		dozeLog,
		pulseExpansionHandler,
		notificationWakeUpCoordinator,
		keyguardBypassController,
		@@ -203,10 +192,7 @@ public class CarStatusBarModule {
		notificationEntryManager,
		notificationInterruptionStateProvider,
		notificationViewHierarchyManager,
		foregroundServiceController,
		appOpsController,
		keyguardViewMediator,
		zenModeController,
		notificationAlertingManager,
		displayMetrics,
		metricsLogger,
		@@ -233,7 +219,6 @@ public class CarStatusBarModule {
		configurationController,
		statusBarWindowController,
		statusBarWindowViewControllerBuilder,
		notifLog,
		dozeParameters,
		scrimController,
		lockscreenWallpaperLazy,

packages/SystemUI/src/com/android/systemui/ForegroundServiceController.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -15,12 +15,14 @@
		package com.android.systemui;

		import android.annotation.Nullable;
		import android.app.AppOpsManager;
		import android.os.UserHandle;
		import android.service.notification.StatusBarNotification;
		import android.util.ArraySet;
		import android.util.SparseArray;

		import com.android.internal.messages.nano.SystemMessageProto;
		import com.android.systemui.appops.AppOpsController;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;

		@@ -33,14 +35,21 @@ import javax.inject.Singleton;
		*/
		@Singleton
		public class ForegroundServiceController {
		private static final int[] APP_OPS = new int[] {AppOpsManager.OP_CAMERA,
		AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
		AppOpsManager.OP_RECORD_AUDIO,
		AppOpsManager.OP_COARSE_LOCATION,
		AppOpsManager.OP_FINE_LOCATION};

		private final SparseArray<ForegroundServicesUserState> mUserServices = new SparseArray<>();
		private final Object mMutex = new Object();
		private final NotificationEntryManager mEntryManager;

		@Inject
		public ForegroundServiceController(NotificationEntryManager entryManager) {
		public ForegroundServiceController(NotificationEntryManager entryManager,
		AppOpsController appOpsController) {
		mEntryManager = entryManager;
		appOpsController.addCallback(APP_OPS, this::onAppOpChanged);
		}

		/**

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -261,6 +261,7 @@ public class NotificationEntryManager implements
		boolean isNew = mNotificationData.get(entry.getKey()) == null;
		if (isNew) {
		for (NotificationEntryListener listener : mNotificationEntryListeners) {
		mNotifLog.log(NotifEvent.INFLATED, entry);
		listener.onEntryInflated(entry, inflatedFlags);
		}
		mNotificationData.add(entry);
		@@ -270,6 +271,7 @@ public class NotificationEntryManager implements
		}
		} else {
		for (NotificationEntryListener listener : mNotificationEntryListeners) {
		mNotifLog.log(NotifEvent.INFLATED, entry);
		listener.onEntryReinflated(entry);
		}
		}

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.systemui.statusbar.notification;
		import static com.android.internal.util.Preconditions.checkNotNull;

		import com.android.internal.statusbar.NotificationVisibility;
		import com.android.systemui.ForegroundServiceController;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.notification.stack.NotificationListContainer;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		@@ -34,17 +33,14 @@ import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceP
		public class NotificationListController {
		private final NotificationEntryManager mEntryManager;
		private final NotificationListContainer mListContainer;
		private final ForegroundServiceController mForegroundServiceController;
		private final DeviceProvisionedController mDeviceProvisionedController;

		public NotificationListController(
		NotificationEntryManager entryManager,
		NotificationListContainer listContainer,
		ForegroundServiceController foregroundServiceController,
		DeviceProvisionedController deviceProvisionedController) {
		mEntryManager = checkNotNull(entryManager);
		mListContainer = checkNotNull(listContainer);
		mForegroundServiceController = checkNotNull(foregroundServiceController);
		mDeviceProvisionedController = checkNotNull(deviceProvisionedController);
		}