Merge "Pass Handler as constructor param to HUN Managers" (308b141a) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -178,7 +178,8 @@ public abstract class SystemUIDefaultModule {
		KeyguardBypassController bypassController,
		GroupMembershipManager groupManager,
		VisualStabilityProvider visualStabilityProvider,
		ConfigurationController configurationController) {
		ConfigurationController configurationController,
		@Main Handler handler) {
		return new HeadsUpManagerPhone(
		context,
		headsUpManagerLogger,
		@@ -186,7 +187,8 @@ public abstract class SystemUIDefaultModule {
		bypassController,
		groupManager,
		visualStabilityProvider,
		configurationController
		configurationController,
		handler
		);
		}

packages/SystemUI/src/com/android/systemui/statusbar/AlertingNotificationManager.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -19,13 +19,12 @@ package com.android.systemui.statusbar;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.SystemClock;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.view.accessibility.AccessibilityEvent;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;
		import com.android.systemui.statusbar.policy.HeadsUpManagerLogger;
		@@ -43,8 +42,9 @@ public abstract class AlertingNotificationManager implements NotificationLifetim
		protected final ArrayMap<String, AlertEntry> mAlertEntries = new ArrayMap<>();
		protected final HeadsUpManagerLogger mLogger;

		public AlertingNotificationManager(HeadsUpManagerLogger logger) {
		public AlertingNotificationManager(HeadsUpManagerLogger logger, @Main Handler handler) {
		mLogger = logger;
		mHandler = handler;
		}

		/**
		@@ -57,8 +57,7 @@ public abstract class AlertingNotificationManager implements NotificationLifetim
		protected NotificationSafeToRemoveCallback mNotificationLifetimeFinishedCallback;
		protected int mMinimumDisplayTime;
		protected int mAutoDismissNotificationDecay;
		@VisibleForTesting
		public Handler mHandler = new Handler(Looper.getMainLooper());
		private final Handler mHandler;

		/**
		* Called when posting a new notification that should alert the user and appear on screen.

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.Nullable;
		import android.content.Context;
		import android.content.res.Resources;
		import android.graphics.Region;
		import android.os.Handler;
		import android.util.Pools;

		import androidx.collection.ArraySet;
		@@ -29,6 +30,7 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.policy.SystemBarUtils;
		import com.android.systemui.Dumpable;
		import com.android.systemui.R;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;
		import com.android.systemui.statusbar.StatusBarState;
		@@ -105,8 +107,9 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable,
		KeyguardBypassController bypassController,
		GroupMembershipManager groupMembershipManager,
		VisualStabilityProvider visualStabilityProvider,
		ConfigurationController configurationController) {
		super(context, logger);
		ConfigurationController configurationController,
		@Main Handler handler) {
		super(context, logger, handler);
		Resources resources = mContext.getResources();
		mExtensionTime = resources.getInteger(R.integer.ambient_notification_extension_time);
		statusBarStateController.addCallback(mStatusBarStateListener);

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.app.Notification;
		import android.content.Context;
		import android.content.res.Resources;
		import android.database.ContentObserver;
		import android.os.Handler;
		import android.provider.Settings;
		import android.util.ArrayMap;
		import android.view.accessibility.AccessibilityManager;
		@@ -34,6 +35,7 @@ import com.android.internal.logging.UiEventLogger;
		import com.android.systemui.Dependency;
		import com.android.systemui.EventLogTags;
		import com.android.systemui.R;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.statusbar.AlertingNotificationManager;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;
		@@ -80,8 +82,9 @@ public abstract class HeadsUpManager extends AlertingNotificationManager {
		}
		}

		public HeadsUpManager(@NonNull final Context context, HeadsUpManagerLogger logger) {
		super(logger);
		public HeadsUpManager(@NonNull final Context context, HeadsUpManagerLogger logger,
		@Main Handler handler) {
		super(logger, handler);
		mContext = context;
		mAccessibilityMgr = Dependency.get(AccessibilityManagerWrapper.class);
		mUiEventLogger = Dependency.get(UiEventLogger.class);
		@@ -95,7 +98,7 @@ public abstract class HeadsUpManager extends AlertingNotificationManager {

		mSnoozeLengthMs = Settings.Global.getInt(context.getContentResolver(),
		SETTING_HEADS_UP_SNOOZE_LENGTH_MS, defaultSnoozeLengthMs);
		ContentObserver settingsObserver = new ContentObserver(mHandler) {
		ContentObserver settingsObserver = new ContentObserver(handler) {
		@Override
		public void onChange(boolean selfChange) {
		final int packageSnoozeLengthMs = Settings.Global.getInt(

packages/SystemUI/src/com/android/systemui/tv/TvSystemUIModule.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -169,7 +169,8 @@ public abstract class TvSystemUIModule {
		KeyguardBypassController bypassController,
		GroupMembershipManager groupManager,
		VisualStabilityProvider visualStabilityProvider,
		ConfigurationController configurationController) {
		ConfigurationController configurationController,
		@Main Handler handler) {
		return new HeadsUpManagerPhone(
		context,
		headsUpManagerLogger,
		@@ -177,7 +178,8 @@ public abstract class TvSystemUIModule {
		bypassController,
		groupManager,
		visualStabilityProvider,
		configurationController
		configurationController,
		handler
		);
		}