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

Merge "Fixed a bug where the clearable flag was set inconsistently" into lmp-mr1-dev

Browse Source
This commit is contained in:
Selim Cinek
2014-11-12 16:13:05 +00:00
committed by Android (Google) Code Review
parent 29685c2fde a37774f098
commit 9852ecd637
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1486,8 +1486,6 @@ public abstract class BaseStatusBar extends SystemUI implements
entry.autoRedacted = true;
}
row.setClearable(sbn.isClearable());
if (MULTIUSER_DEBUG) {
TextView debug = (TextView) row.findViewById(R.id.debug_info);
if (debug != null) {

13
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -118,6 +118,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
public void setStatusBarNotification(StatusBarNotification statusBarNotification) {
mStatusBarNotification = statusBarNotification;
updateVetoButton();
}
public StatusBarNotification getStatusBarNotification() {
@@ -303,17 +304,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
* @return Can the underlying notification be cleared?
*/
public boolean isClearable() {
return mClearable;
}
/**
* Set whether the notification can be cleared.
*
* @param clearable
*/
public void setClearable(boolean clearable) {
mClearable = clearable;
updateVetoButton();
return mStatusBarNotification != null && mStatusBarNotification.isClearable();
}
/**