diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java | 18 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bubbles/BubbleExperimentConfig.java | 6 |
2 files changed, 20 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java index 19381940543e..4b75696fa256 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java @@ -162,6 +162,10 @@ public class BubbleController implements ConfigurationController.ConfigurationLi // Saves notification keys of user created "fake" bubbles so that we can allow notifications // like these to bubble by default. Doesn't persist across reboots, not a long-term solution. private final HashSet<String> mUserCreatedBubbles; + // If we're auto-bubbling bubbles via a whitelist, we need to track which notifs from that app + // have been "demoted" back to a notification so that we don't auto-bubbles those again. + // Doesn't persist across reboots, not a long-term solution. + private final HashSet<String> mUserBlockedBubbles; // Bubbles get added to the status bar view private final StatusBarWindowController mStatusBarWindowController; @@ -348,6 +352,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi }); mUserCreatedBubbles = new HashSet<>(); + mUserBlockedBubbles = new HashSet<>(); mScreenshotHelper = new ScreenshotHelper(context); } @@ -583,6 +588,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi entry.setFlagBubble(true); updateBubble(entry, true /* suppressFlyout */, false /* showInShade */); mUserCreatedBubbles.add(entry.getKey()); + mUserBlockedBubbles.remove(entry.getKey()); } /** @@ -598,6 +604,12 @@ public class BubbleController implements ConfigurationController.ConfigurationLi entry.setFlagBubble(false); removeBubble(entry.getKey(), DISMISS_BLOCKED); mUserCreatedBubbles.remove(entry.getKey()); + if (BubbleExperimentConfig.isPackageWhitelistedToAutoBubble( + mContext, entry.getSbn().getPackageName())) { + // This package is whitelist but user demoted the bubble, let's save it so we don't + // auto-bubble for the whitelist again. + mUserBlockedBubbles.add(entry.getKey()); + } } /** @@ -727,8 +739,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi @Override public void onPendingEntryAdded(NotificationEntry entry) { boolean previouslyUserCreated = mUserCreatedBubbles.contains(entry.getKey()); + boolean userBlocked = mUserBlockedBubbles.contains(entry.getKey()); boolean wasAdjusted = BubbleExperimentConfig.adjustForExperiments( - mContext, entry, previouslyUserCreated); + mContext, entry, previouslyUserCreated, userBlocked); if (mNotificationInterruptionStateProvider.shouldBubbleUp(entry) && (canLaunchInActivityView(mContext, entry) || wasAdjusted)) { @@ -743,8 +756,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi @Override public void onPreEntryUpdated(NotificationEntry entry) { boolean previouslyUserCreated = mUserCreatedBubbles.contains(entry.getKey()); + boolean userBlocked = mUserBlockedBubbles.contains(entry.getKey()); boolean wasAdjusted = BubbleExperimentConfig.adjustForExperiments( - mContext, entry, previouslyUserCreated); + mContext, entry, previouslyUserCreated, userBlocked); boolean shouldBubble = mNotificationInterruptionStateProvider.shouldBubbleUp(entry) && (canLaunchInActivityView(mContext, entry) || wasAdjusted); diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExperimentConfig.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExperimentConfig.java index 8299f2261b8e..ac0e7bb226c4 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExperimentConfig.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExperimentConfig.java @@ -143,7 +143,7 @@ public class BubbleExperimentConfig { * @return whether an adjustment was made. */ static boolean adjustForExperiments(Context context, NotificationEntry entry, - boolean previouslyUserCreated) { + boolean previouslyUserCreated, boolean userBlocked) { Notification.BubbleMetadata metadata = null; boolean addedMetadata = false; boolean whiteListedToAutoBubble = @@ -205,7 +205,9 @@ public class BubbleExperimentConfig { } } - boolean bubbleForWhitelist = whiteListedToAutoBubble && (addedMetadata || hasMetadata); + boolean bubbleForWhitelist = !userBlocked + && whiteListedToAutoBubble + && (addedMetadata || hasMetadata); if ((previouslyUserCreated && addedMetadata) || bubbleForWhitelist) { // Update to a previous bubble (or new autobubble), set its flag now. if (DEBUG_EXPERIMENTS) { |