Merge "Check if apps allowed to show bubbles" into tm-qpr-dev am: 0d61ab9e5d am: 3b2ca6dbf9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19060562

Change-Id: I30575907c59de5e8ad6db02377b0c80e19f380a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sergey Serokurov
2022-06-27 16:06:42 +00:00
committed by Automerger Merge Worker

View File

@@ -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);