commit 0d61ab9e5d21b62ec471b90e8883190ccf4e5444
author Sergey Serokurov <serokurov@google.com> Mon Jun 27 15:30:32 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 27 15:30:32 2022 +0000
tree c08d5544e9256333f2ba9a5747a26b69acdab796
parent 633202b4e135ed84018ef2be2cf2a2ac5fb264fe
parent d107f6266155a22d189c29d6bd22ee0c1ee608cf

Merge "Check if apps allowed to show bubbles" into tm-qpr-dev

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
index 134f24e..27aa4b3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
@@ -266,9 +266,14 @@
         snooze.setOnClickListener(mOnSnoozeClick);
         */
 
-        if (mAppBubble == BUBBLE_PREFERENCE_ALL) {
-            ((TextView) findViewById(R.id.default_summary)).setText(getResources().getString(
+        TextView defaultSummaryTextView = findViewById(R.id.default_summary);
+        if (mAppBubble == BUBBLE_PREFERENCE_ALL
+                && BubblesManager.areBubblesEnabled(mContext, mSbn.getUser())) {
+            defaultSummaryTextView.setText(getResources().getString(
                     R.string.notification_channel_summary_default_with_bubbles, mAppName));
+        } else {
+            defaultSummaryTextView.setText(getResources().getString(
+                    R.string.notification_channel_summary_default));
         }
 
         findViewById(R.id.priority).setOnClickListener(mOnFavoriteClick);