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

Commit e4c068d2 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a bug with public notifications 

Public notification titles were incorrectly modified when
the notification wasn't autoredacted (i.e screenshot).
This also lead to the doze mode not working correctly anymore
as notifications were colored.

Bug: 24866646
Change-Id: I3d4cdb0e13cfbf3fb8082b930936260d7c4749af
parent 0934bd99

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+13 −7
Original line number Diff line number Diff line
@@ -2139,15 +2139,21 @@ public abstract class BaseStatusBar extends SystemUI implements 
    protected void updatePublicContentView(Entry entry,

            StatusBarNotification sbn) {

        final RemoteViews publicContentView = entry.cachedPublicContentView;

        if (publicContentView != null && entry.getPublicContentView() != null) {

        View inflatedView = entry.getPublicContentView();

        if (entry.autoRedacted && publicContentView != null && inflatedView != null) {

            final boolean disabledByPolicy =

                    !adminAllowsUnredactedNotifications(entry.notification.getUserId());

            publicContentView.setTextViewText(android.R.id.title,

                    mContext.getString(disabledByPolicy

            String notificationHiddenText = mContext.getString(disabledByPolicy

                    ? com.android.internal.R.string.notification_hidden_by_policy_text

                            : com.android.internal.R.string.notification_hidden_text));

                    : com.android.internal.R.string.notification_hidden_text);

            TextView titleView = (TextView) inflatedView.findViewById(android.R.id.title);

            if (titleView != null

                    && !titleView.getText().toString().equals(notificationHiddenText)) {

                publicContentView.setTextViewText(android.R.id.title, notificationHiddenText);

                publicContentView.reapply(sbn.getPackageContext(mContext),

                    entry.getPublicContentView(), mOnClickHandler);

                        inflatedView, mOnClickHandler);

                entry.row.onNotificationUpdated(entry);

            }

        }

    }