Fix bug swiping away NO_CLEAR notifications.

Bug: 5121507
Change-Id: I798686cfc8506805298e1481a3d603ce700e12f4

Author: dsandler

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

@@ -760,12 +760,10 @@ public void onClick(View v) {
                     }
                 });
         } 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 void onClick(View v) {
                     }
                 });
         } 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));

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

@@ -1747,12 +1747,7 @@ public void onClick(View v) {
                     }
                 });
         } 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));