Merge "Extract NotificationData.Entry to top-level" (92ec9dfd) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/car/CarNotificationInterruptionStateProvider.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,8 @@ package com.android.systemui.car;

		import android.content.Context;

		import com.android.systemui.statusbar.notification.NotificationData;
		import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;

		/** Auto-specific implementation of {@link NotificationInterruptionStateProvider}. */
		public class CarNotificationInterruptionStateProvider extends
		@@ -29,7 +29,7 @@ public class CarNotificationInterruptionStateProvider extends
		}

		@Override
		public boolean shouldHeadsUp(NotificationData.Entry entry) {
		public boolean shouldHeadsUp(NotificationEntry entry) {
		// Because space is usually constrained in the auto use-case, there should not be a
		// pinned notification when the shade has been expanded. Ensure this by not pinning any
		// notification if the shade is already opened.

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,12 +56,12 @@ import com.android.systemui.statusbar.SmartReplyController;
		import com.android.systemui.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.VibratorHelper;
		import com.android.systemui.statusbar.notification.NotificationAlertingManager;
		import com.android.systemui.statusbar.notification.NotificationData.KeyguardEnvironment;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.NotificationFilter;
		import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
		import com.android.systemui.statusbar.notification.NotificationRowBinder;
		import com.android.systemui.statusbar.notification.VisualStabilityManager;
		import com.android.systemui.statusbar.notification.collection.NotificationData.KeyguardEnvironment;
		import com.android.systemui.statusbar.notification.logging.NotificationLogger;
		import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager;
		import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -24,9 +24,9 @@ import android.service.notification.StatusBarNotification;
		import android.util.Log;

		import com.android.internal.statusbar.NotificationVisibility;
		import com.android.systemui.statusbar.notification.NotificationData;
		import com.android.systemui.statusbar.notification.NotificationEntryListener;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;

		import javax.inject.Inject;
		import javax.inject.Singleton;
		@@ -49,18 +49,18 @@ public class ForegroundServiceNotificationListener {
		mForegroundServiceController = foregroundServiceController;
		notificationEntryManager.addNotificationEntryListener(new NotificationEntryListener() {
		@Override
		public void onPendingEntryAdded(NotificationData.Entry entry) {
		public void onPendingEntryAdded(NotificationEntry entry) {
		addNotification(entry.notification, entry.importance);
		}

		@Override
		public void onEntryUpdated(NotificationData.Entry entry) {
		public void onEntryUpdated(NotificationEntry entry) {
		updateNotification(entry.notification, entry.importance);
		}

		@Override
		public void onEntryRemoved(
		NotificationData.Entry entry,
		NotificationEntry entry,
		NotificationVisibility visibility,
		boolean removedByUser) {
		removeNotification(entry.notification);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,9 +40,9 @@ import com.android.systemui.statusbar.NotificationListener;
		import com.android.systemui.statusbar.NotificationLockscreenUserManager;
		import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;
		import com.android.systemui.statusbar.ScrimView;
		import com.android.systemui.statusbar.notification.NotificationData;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
		import com.android.systemui.statusbar.notification.collection.NotificationData;
		import com.android.systemui.statusbar.phone.DozeParameters;
		import com.android.systemui.statusbar.phone.KeyguardBouncer;
		import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -35,9 +35,9 @@ import android.widget.FrameLayout;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.statusbar.notification.NotificationData;
		import com.android.systemui.statusbar.notification.NotificationEntryListener;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.phone.StatusBarWindowController;

		import java.util.ArrayList;
		@@ -180,7 +180,7 @@ public class BubbleController {
		/**
		* Adds a bubble associated with the provided notification entry or updates it if it exists.
		*/
		public void addBubble(NotificationData.Entry notif) {
		public void addBubble(NotificationEntry notif) {
		if (mBubbles.containsKey(notif.key)) {
		// It's an update
		BubbleView bubble = mBubbles.get(notif.key);
		@@ -226,7 +226,7 @@ public class BubbleController {
		bv.getEntry().setBubbleDismissed(true);
		}

		NotificationData.Entry entry = mNotificationEntryManager.getNotificationData().get(key);
		NotificationEntry entry = mNotificationEntryManager.getNotificationData().get(key);
		if (entry != null) {
		entry.setBubbleDismissed(true);
		if (!DEBUG_DEMOTE_TO_NOTIF) {
		@@ -241,7 +241,7 @@ public class BubbleController {
		@SuppressWarnings("FieldCanBeLocal")
		private final NotificationEntryListener mEntryListener = new NotificationEntryListener() {
		@Override
		public void onPendingEntryAdded(NotificationData.Entry entry) {
		public void onPendingEntryAdded(NotificationEntry entry) {
		if (shouldAutoBubble(mContext, entry)) {
		entry.setIsBubble(true);
		}
		@@ -275,7 +275,7 @@ public class BubbleController {
		}
		ArrayList<BubbleView> viewsToRemove = new ArrayList<>();
		for (BubbleView bv : mBubbles.values()) {
		NotificationData.Entry entry = bv.getEntry();
		NotificationEntry entry = bv.getEntry();
		if (entry != null) {
		if (entry.isRowRemoved() \|\| entry.isBubbleDismissed() \|\| entry.isRowDismissed()) {
		viewsToRemove.add(bv);
		@@ -332,7 +332,7 @@ public class BubbleController {
		/**
		* Whether the notification should bubble or not.
		*/
		private static boolean shouldAutoBubble(Context context, NotificationData.Entry entry) {
		private static boolean shouldAutoBubble(Context context, NotificationEntry entry) {
		if (entry.isBubbleDismissed()) {
		return false;
		}