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

Merge "Fix bug swiping away NO_CLEAR notifications."

Browse Source
This commit is contained in:
Daniel Sandler
2011-09-11 17:08:41 -07:00
committed by Android (Google) Code Review
parent 6c048260f3 113045ab9c
commit 8dbdee5b16
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));

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

@@ -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));