diff options
author | Dianne Hackborn <hackbod@google.com> | 2012-01-13 16:36:05 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-13 16:36:05 -0800 |
commit | cc7bd5ab550855c14c76701709b35d12a9677eb2 (patch) | |
tree | 2a8dac971143fef2017d95fd2c0a704358101841 /core | |
parent | bd9d9d3ae2a758139c7dd722c4836a33b9b059a8 (diff) | |
parent | 6ceca588a268ed8fef4b32df278ca7567e608510 (diff) | |
download | frameworks_base-cc7bd5ab550855c14c76701709b35d12a9677eb2.zip frameworks_base-cc7bd5ab550855c14c76701709b35d12a9677eb2.tar.gz frameworks_base-cc7bd5ab550855c14c76701709b35d12a9677eb2.tar.bz2 |
Merge "Update notification documentation to follow current guidelines." into ics-mr1
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/app/Notification.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index f5add25..d569e20 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -113,7 +113,10 @@ public class Notification implements Parcelable * {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK} flag, which requires * that you take care of task management as described in the * <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back - * Stack</a> document. + * Stack</a> document. In particular, make sure to read the notification section + * <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html#HandlingNotifications">Handling + * Notifications</a> for the correct ways to launch an application from a + * notification. */ public PendingIntent contentIntent; @@ -765,7 +768,9 @@ public class Notification implements Parcelable * Supply a {@link PendingIntent} to send when the notification is clicked. * If you do not supply an intent, you can now add PendingIntents to individual * views to be launched when clicked by calling {@link RemoteViews#setOnClickPendingIntent - * RemoteViews.setOnClickPendingIntent(int,PendingIntent)}. + * RemoteViews.setOnClickPendingIntent(int,PendingIntent)}. Be sure to + * read {@link Notification#contentIntent Notification.contentIntent} for + * how to correctly use this. */ public Builder setContentIntent(PendingIntent intent) { mContentIntent = intent; |