diff options
| author | 2022-06-27 15:47:47 +0000 | |
|---|---|---|
| committer | 2022-06-27 15:47:47 +0000 | |
| commit | 3b2ca6dbf9438577400225e684c75920eea3cba6 (patch) | |
| tree | 927725f81e148d203caa7c883d869584b2d9c98a | |
| parent | 8c823801c2a6f3371dfe49a7c6c30e102c0ee231 (diff) | |
| parent | 0d61ab9e5d21b62ec471b90e8883190ccf4e5444 (diff) | |
Merge "Check if apps allowed to show bubbles" into tm-qpr-dev am: 0d61ab9e5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19060562
Change-Id: Ia4cd1c155d2f96433b237d5ce8a0ff3f64c65de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java | 9 |
1 files changed, 7 insertions, 2 deletions
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 134f24e7e646..27aa4b38e0ba 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 @@ public class NotificationConversationInfo extends LinearLayout implements 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); |