Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 3b07c7f5e6

* commit '3b07c7f5e6d8fb58f18705b6af415e9a005bf40d':
  Fixed a bug with public notifications
This commit is contained in:
Selim Cinek
2016-02-23 01:33:53 +00:00
committed by android-build-merger
parent 5ef30d5b0c 3b07c7f5e6
commit df72e80b03
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -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
? com.android.internal.R.string.notification_hidden_by_policy_text
: com.android.internal.R.string.notification_hidden_text));
publicContentView.reapply(sbn.getPackageContext(mContext),
entry.getPublicContentView(), mOnClickHandler);
String notificationHiddenText = mContext.getString(disabledByPolicy
? com.android.internal.R.string.notification_hidden_by_policy_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),
inflatedView, mOnClickHandler);
entry.row.onNotificationUpdated(entry);
}
}
}