merge from open-source master

Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca
This commit is contained in:
The Android Open Source Project
2010-05-19 08:13:51 -07:00

View File

@@ -174,7 +174,7 @@ public class StatusBarNotifications extends Activity {
// Send the notification. // Send the notification.
// We use a layout id because it is a unique number. We use it later to cancel. // 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) { 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 // we use a string id because is a unique number. we use it later to cancel the
// notification // notification
mNotificationManager.notify(R.layout.status_bar_notifications, notif); mNotificationManager.notify(MOOD_NOTIFICATIONS, notif);
} }
private void setDefault(int defaults) { private void setDefault(int defaults) {
@@ -231,8 +231,8 @@ public class StatusBarNotifications extends Activity {
notification.defaults = defaults; notification.defaults = defaults;
mNotificationManager.notify( mNotificationManager.notify(
R.layout.status_bar_notifications, // we use a string id because it is a unique MOOD_NOTIFICATIONS, // we use a string id because it is a unique
// number. we use it later to cancel the // number. we use it later to cancel the notification
notification); // notification notification);
} }
} }