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

Commit df72e80b authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a bug with public notifications" into nyc-dev am: 5a25783d 

am: 3b07c7f5

* commit '3b07c7f5':
  Fixed a bug with public notifications
parents 5ef30d5b 3b07c7f5

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

            }

        }

    }