commit e3175370f99919dab91d161c80c1c02cfea0a127
author Mady Mellor <madym@google.com> Tue Dec 04 17:05:11 2018 -0800
committer Mady Mellor <madym@google.com> Wed Dec 05 14:53:07 2018 -0800
tree f0d55565eec0c0833b67d00cf4224bf33ddc0065
parent 6ad12e57bb1991be1bd8f8ffad898dc2a92d3a57

Require category message when auto-bubbling messages

Test: manual
Bug: 111236845
Change-Id: I4f2ee780aff5fadcc494ca8abf7966ee34f24803

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

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
index 416cc59..c64f3da 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
@@ -344,10 +344,9 @@
         }
 
         Class<? extends Notification.Style> style = n.getNotification().getNotificationStyle();
-        boolean isMessageType = Notification.MessagingStyle.class.equals(style)
-                || Notification.CATEGORY_MESSAGE.equals(n.getNotification().category)
-                || hasRemoteInput;
-        return (isMessageType && autoBubbleMessages)
+        boolean isMessageType = Notification.CATEGORY_MESSAGE.equals(n.getNotification().category);
+        boolean isMessageStyle = Notification.MessagingStyle.class.equals(style);
+        return (((isMessageType && hasRemoteInput) || isMessageStyle) && autoBubbleMessages)
                 || (n.isOngoing() && autoBubbleOngoing)
                 || autoBubbleAll;
     }