summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2013-04-25 21:04:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-25 21:04:02 +0000
commit77f71cb226203bf3f87eec749296feb3ecd18f43 (patch)
tree77e7f3d6d13bbfc450c35515435a3c9a48b47ddc
parent410e2df458328d5375b35ef9a610da240293d06b (diff)
parentfbfddb0d67479ba8104adaf3f83ccb3534862762 (diff)
downloadpackages_apps_Settings-77f71cb226203bf3f87eec749296feb3ecd18f43.zip
packages_apps_Settings-77f71cb226203bf3f87eec749296feb3ecd18f43.tar.gz
packages_apps_Settings-77f71cb226203bf3f87eec749296feb3ecd18f43.tar.bz2
Merge "Follow API changes to NotificationListener." into jb-mr2-dev
-rw-r--r--src/com/android/settings/NotificationStation.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/settings/NotificationStation.java b/src/com/android/settings/NotificationStation.java
index 1a44542..10457b9 100644
--- a/src/com/android/settings/NotificationStation.java
+++ b/src/com/android/settings/NotificationStation.java
@@ -206,26 +206,26 @@ public class NotificationStation extends SettingsPreferenceFragment {
: new StatusBarNotification[][] { active, dismissed }) {
for (StatusBarNotification sbn : resultset) {
final HistoricalNotificationInfo info = new HistoricalNotificationInfo();
- info.pkg = sbn.pkg;
+ info.pkg = sbn.getPackageName();
info.user = sbn.getUserId();
- info.icon = loadIconDrawable(info.pkg, info.user, sbn.notification.icon);
+ info.icon = loadIconDrawable(info.pkg, info.user, sbn.getNotification().icon);
info.pkgicon = loadPackageIconDrawable(info.pkg, info.user);
info.pkgname = loadPackageName(info.pkg);
- if (sbn.notification.extras != null) {
- info.title = sbn.notification.extras.getString(Notification.EXTRA_TITLE);
+ if (sbn.getNotification().extras != null) {
+ info.title = sbn.getNotification().extras.getString(Notification.EXTRA_TITLE);
if (info.title == null || "".equals(info.title)) {
- info.title = sbn.notification.extras.getString(Notification.EXTRA_TEXT);
+ info.title = sbn.getNotification().extras.getString(Notification.EXTRA_TEXT);
}
}
if (info.title == null || "".equals(info.title)) {
- info.title = sbn.notification.tickerText;
+ info.title = sbn.getNotification().tickerText;
}
// still nothing? come on, give us something!
if (info.title == null || "".equals(info.title)) {
info.title = info.pkgname;
}
- info.timestamp = sbn.postTime;
- info.priority = sbn.notification.priority;
+ info.timestamp = sbn.getPostTime();
+ info.priority = sbn.getNotification().priority;
logd(" [%d] %s: %s", info.timestamp, info.pkg, info.title);
info.active = (resultset == active);