Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d54efa7c authored by Sergey Serokurov's avatar Sergey Serokurov Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I30575907c59de5e8ad6db02377b0c80e19f380a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79351ebd 3b2ca6db

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

+7 −2
Original line number Diff line number Diff line
@@ -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);