Bubble API: post update when bubble notification suppression flag changes
When bubbles are expanded or if the user dismisses the notification, the
notification associated with the bubble is suppressed from the shade, but
still technically active / in active notification list because of the
bubble.
We already have a concept of this with isNotificationSuppressed on
BubbleMetadata, this just ensures that the flag is properly updated when
the state changes in System UI. This allows other things showing
notifications (e.g. long press on launcher app icon -> see notifs) to
hide or show notifications consistently with the rest of system ui.
I'm re-using the flag that apps may set to suppress notifications when
they send a bubble that is foreground, since its the same concept.
When this flag state changes a new update is sent with the flag
adjusted.
Added a notification delegate method to communicate the suppression changes
back to NoMan. This is piped through a listener set on Bubble objects.
Test: atest NotificationManagerTest NotificationTest NotificationManagerServiceTest
Bug: 131926652
Bug: 144352570
Change-Id: I25e86849858cdfe2fb81ab51b1ff09980bf70944
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java
index ccce85c..45705b7 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/Bubble.java
@@ -60,6 +60,14 @@
private long mLastUpdated;
private long mLastAccessed;
+ private BubbleController.NotificationSuppressionChangedListener mSuppressionListener;
+
+ /** Whether the bubble should show a dot for the notification indicating updated content. */
+ private boolean mShowBubbleUpdateDot = true;
+
+ /** Whether flyout text should be suppressed, regardless of any other flags or state. */
+ private boolean mSuppressFlyout;
+
// Items that are typically loaded later
private String mAppName;
private ShortcutInfo mShortcutInfo;
@@ -71,20 +79,6 @@
private boolean mInflateSynchronously;
/**
- * Whether this notification should be shown in the shade when it is also displayed as a bubble.
- *
- * <p>When a notification is a bubble we don't show it in the shade once the bubble has been
- * expanded</p>
- */
- private boolean mShowInShadeWhenBubble = true;
-
- /** Whether the bubble should show a dot for the notification indicating updated content. */
- private boolean mShowBubbleUpdateDot = true;
-
- /** Whether flyout text should be suppressed, regardless of any other flags or state. */
- private boolean mSuppressFlyout;
-
- /**
* Presentational info about the flyout.
*/
public static class FlyoutMessage {
@@ -106,11 +100,13 @@
/** Used in tests when no UI is required. */
@VisibleForTesting(visibility = PRIVATE)
- Bubble(NotificationEntry e) {
+ Bubble(NotificationEntry e,
+ BubbleController.NotificationSuppressionChangedListener listener) {
mEntry = e;
mKey = e.getKey();
mLastUpdated = e.getSbn().getPostTime();
mGroupId = groupId(e);
+ mSuppressionListener = listener;
}
public String getKey() {
@@ -278,7 +274,7 @@
*/
void markAsAccessedAt(long lastAccessedMillis) {
mLastAccessed = lastAccessedMillis;
- setShowInShade(false);
+ setSuppressNotification(true);
setShowDot(false /* show */, true /* animate */);
}
@@ -290,20 +286,30 @@
}
/**
- * Whether this notification should be shown in the shade when it is also displayed as a
- * bubble.
+ * Whether this notification should be shown in the shade.
*/
boolean showInShade() {
- return !mEntry.isRowDismissed() && !shouldSuppressNotification()
- && (!mEntry.isClearable() || mShowInShadeWhenBubble);
+ return !shouldSuppressNotification() || !mEntry.isClearable();
}
/**
- * Sets whether this notification should be shown in the shade when it is also displayed as a
- * bubble.
+ * Sets whether this notification should be suppressed in the shade.
*/
- void setShowInShade(boolean showInShade) {
- mShowInShadeWhenBubble = showInShade;
+ void setSuppressNotification(boolean suppressNotification) {
+ boolean prevShowInShade = showInShade();
+
+ Notification.BubbleMetadata data = mEntry.getBubbleMetadata();
+ int flags = data.getFlags();
+ if (suppressNotification) {
+ flags |= Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION;
+ } else {
+ flags &= ~Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION;
+ }
+ data.setFlags(flags);
+
+ if (showInShade() != prevShowInShade && mSuppressionListener != null) {
+ mSuppressionListener.onBubbleNotificationSuppressionChange(this);
+ }
}
/**
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
index 8c9946f..2ed5b10 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
@@ -224,6 +224,17 @@
}
/**
+ * Listener to be notified when a bubbles' notification suppression state changes.
+ */
+ public interface NotificationSuppressionChangedListener {
+ /**
+ * Called when the notification suppression state of a bubble changes.
+ */
+ void onBubbleNotificationSuppressionChange(Bubble bubble);
+
+ }
+
+ /**
* Listens for the current state of the status bar and updates the visibility state
* of bubbles as needed.
*/
@@ -303,9 +314,22 @@
configurationController.addCallback(this /* configurationListener */);
+ mMaxBubbles = mContext.getResources().getInteger(R.integer.bubbles_max_rendered);
mBubbleData = data;
mBubbleData.setListener(mBubbleDataListener);
- mMaxBubbles = mContext.getResources().getInteger(R.integer.bubbles_max_rendered);
+ mBubbleData.setSuppressionChangedListener(new NotificationSuppressionChangedListener() {
+ @Override
+ public void onBubbleNotificationSuppressionChange(Bubble bubble) {
+ // Make sure NoMan knows it's not showing in the shade anymore so anyone querying it
+ // can tell.
+ try {
+ mBarService.onBubbleNotificationSuppressionChanged(bubble.getKey(),
+ !bubble.showInShade());
+ } catch (RemoteException e) {
+ // Bad things have happened
+ }
+ }
+ });
mNotificationEntryManager = entryManager;
mNotificationEntryManager.addNotificationEntryListener(mEntryListener);
@@ -720,7 +744,7 @@
Bubble bubble = mBubbleData.getBubbleWithKey(key);
boolean bubbleExtended = entry != null && entry.isBubble() && userRemovedNotif;
if (bubbleExtended) {
- bubble.setShowInShade(false);
+ bubble.setSuppressNotification(true);
bubble.setShowDot(false /* show */, true /* animate */);
mNotificationEntryManager.updateNotifications(
"BubbleController.onNotificationRemoveRequested");
@@ -747,7 +771,7 @@
// As far as group manager is concerned, once a child is no longer shown
// in the shade, it is essentially removed.
mNotificationGroupManager.onEntryRemoved(bubbleChild.getEntry());
- bubbleChild.setShowInShade(false);
+ bubbleChild.setSuppressNotification(true);
bubbleChild.setShowDot(false /* show */, true /* animate */);
}
// And since all children are removed, remove the summary.
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
index 8b687e7..673121f 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
@@ -134,6 +134,9 @@
@Nullable
private Listener mListener;
+ @Nullable
+ private BubbleController.NotificationSuppressionChangedListener mSuppressionListener;
+
/**
* We track groups with summaries that aren't visibly displayed but still kept around because
* the bubble(s) associated with the summary still exist.
@@ -158,6 +161,11 @@
mMaxOverflowBubbles = mContext.getResources().getInteger(R.integer.bubbles_max_overflow);
}
+ public void setSuppressionChangedListener(
+ BubbleController.NotificationSuppressionChangedListener listener) {
+ mSuppressionListener = listener;
+ }
+
public boolean hasBubbles() {
return !mBubbles.isEmpty();
}
@@ -219,7 +227,7 @@
return b;
}
}
- bubble = new Bubble(entry);
+ bubble = new Bubble(entry, mSuppressionListener);
mPendingBubbles.add(bubble);
} else {
bubble.setEntry(entry);
@@ -258,11 +266,13 @@
} else if (mSelectedBubble == null) {
setSelectedBubbleInternal(bubble);
}
- boolean isBubbleExpandedAndSelected = mExpanded && mSelectedBubble == bubble;
- bubble.setShowInShade(!isBubbleExpandedAndSelected && showInShade);
- bubble.setShowDot(!isBubbleExpandedAndSelected /* show */, true /* animate */);
- dispatchPendingChanges();
+ boolean isBubbleExpandedAndSelected = mExpanded && mSelectedBubble == bubble;
+ boolean suppress = isBubbleExpandedAndSelected || !showInShade || !bubble.showInShade();
+ bubble.setSuppressNotification(suppress);
+ bubble.setShowDot(!isBubbleExpandedAndSelected /* show */, true /* animate */);
+
+ dispatchPendingChanges();
}
public void notificationEntryRemoved(NotificationEntry entry, @DismissReason int reason) {