summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-19 08:18:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-19 08:18:13 -0700
commitd350cf1bb828ebe6864a0b91b1c64083ffc83df5 (patch)
treee750817b159e1d5edb61ffe69e26570d2fef2676 /samples
parent1a3ab7bfaf12d218241e0e7a60fbbab15ecbe292 (diff)
parentca81fb411afd93378f01e3e13ef482693fd35a73 (diff)
downloadandroid_development-d350cf1bb828ebe6864a0b91b1c64083ffc83df5.tar.gz
android_development-d350cf1bb828ebe6864a0b91b1c64083ffc83df5.tar.bz2
android_development-d350cf1bb828ebe6864a0b91b1c64083ffc83df5.zip
am ca81fb41: merge from open-source master
Merge commit 'ca81fb411afd93378f01e3e13ef482693fd35a73' into kraken * commit 'ca81fb411afd93378f01e3e13ef482693fd35a73': Corrected StatusBarNotificationSample
Diffstat (limited to 'samples')
-rw-r--r--samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java b/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
index 97f6199c1..9b911cca5 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/StatusBarNotifications.java
@@ -174,7 +174,7 @@ public class StatusBarNotifications extends Activity {
// Send the notification.
// We use a layout id because it is a unique number. We use it later to cancel.
- mNotificationManager.notify(R.layout.status_bar_notifications, notification);
+ mNotificationManager.notify(MOOD_NOTIFICATIONS, notification);
}
private void setMoodView(int moodId, int textId) {
@@ -202,7 +202,7 @@ public class StatusBarNotifications extends Activity {
// we use a string id because is a unique number. we use it later to cancel the
// notification
- mNotificationManager.notify(R.layout.status_bar_notifications, notif);
+ mNotificationManager.notify(MOOD_NOTIFICATIONS, notif);
}
private void setDefault(int defaults) {
@@ -231,8 +231,8 @@ public class StatusBarNotifications extends Activity {
notification.defaults = defaults;
mNotificationManager.notify(
- R.layout.status_bar_notifications, // we use a string id because it is a unique
- // number. we use it later to cancel the
- notification); // notification
+ MOOD_NOTIFICATIONS, // we use a string id because it is a unique
+ // number. we use it later to cancel the notification
+ notification);
}
}