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>
This commit is contained in:
@@ -266,9 +266,14 @@ public class NotificationConversationInfo extends LinearLayout implements
|
|||||||
snooze.setOnClickListener(mOnSnoozeClick);
|
snooze.setOnClickListener(mOnSnoozeClick);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (mAppBubble == BUBBLE_PREFERENCE_ALL) {
|
TextView defaultSummaryTextView = findViewById(R.id.default_summary);
|
||||||
((TextView) findViewById(R.id.default_summary)).setText(getResources().getString(
|
if (mAppBubble == BUBBLE_PREFERENCE_ALL
|
||||||
|
&& BubblesManager.areBubblesEnabled(mContext, mSbn.getUser())) {
|
||||||
|
defaultSummaryTextView.setText(getResources().getString(
|
||||||
R.string.notification_channel_summary_default_with_bubbles, mAppName));
|
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);
|
findViewById(R.id.priority).setOnClickListener(mOnFavoriteClick);
|
||||||
|
|||||||
Reference in New Issue
Block a user