From 113045ab9cc6307b68cc669bbdd4ddbdf69b6230 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Sun, 11 Sep 2011 15:39:24 -0400 Subject: [PATCH] Fix bug swiping away NO_CLEAR notifications. Bug: 5121507 Change-Id: I798686cfc8506805298e1481a3d603ce700e12f4 --- .../android/systemui/statusbar/phone/PhoneStatusBar.java | 15 ++++----------- .../systemui/statusbar/tablet/TabletStatusBar.java | 7 +------ 2 files changed, 5 insertions(+), 17 deletions(-) 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 ee9aa41104bb..7ba36e207d80 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 @@ public class PhoneStatusBar extends StatusBar { } }); } 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 @@ public class PhoneStatusBar extends StatusBar { } }); } 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 39011d37b2c9..c680c49fbc1c 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 @@ public class TabletStatusBar extends StatusBar implements } }); } 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)); -- 2.11.0