Merge "Fix bug swiping away NO_CLEAR notifications."
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index ee9aa41..7ba36e2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -760,12 +760,10 @@
}
});
} else {
- if ((notification.notification.flags & Notification.FLAG_ONGOING_EVENT) == 0) {
- vetoButton.setVisibility(View.INVISIBLE);
- } else {
- vetoButton.setVisibility(View.GONE);
- }
+ vetoButton.setVisibility(View.GONE);
}
+ vetoButton.setContentDescription(mContext.getString(
+ R.string.accessibility_remove_notification));
// the large icon
ImageView largeIcon = (ImageView)row.findViewById(R.id.large_icon);
@@ -957,12 +955,7 @@
}
});
} else {
- if ((sbn.notification.flags & Notification.FLAG_ONGOING_EVENT) == 0) {
- vetoButton.setVisibility(View.INVISIBLE);
- vetoButton.setContentDescription("VETO");
- } else {
- vetoButton.setVisibility(View.GONE);
- }
+ vetoButton.setVisibility(View.GONE);
}
vetoButton.setContentDescription(mContext.getString(
R.string.accessibility_remove_notification));
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
index 39011d3..c680c49 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -1747,12 +1747,7 @@
}
});
} else {
- if ((sbn.notification.flags & Notification.FLAG_ONGOING_EVENT) == 0) {
- vetoButton.setVisibility(View.INVISIBLE);
- vetoButton.setContentDescription("VETO");
- } else {
- vetoButton.setVisibility(View.GONE);
- }
+ vetoButton.setVisibility(View.GONE);
}
vetoButton.setContentDescription(mContext.getString(
R.string.accessibility_remove_notification));