am df3a0f50: Merge "Improve doc." into gingerbread

Merge commit 'df3a0f50c3480911e366c8c0781b0463fe063e82' into gingerbread-plus-aosp

* commit 'df3a0f50c3480911e366c8c0781b0463fe063e82':
  Improve doc.
This commit is contained in:
Dianne Hackborn
2010-09-03 15:18:39 -07:00
committed by Android Git Automerger

View File

@@ -109,9 +109,14 @@ public class Notification implements Parcelable
public PendingIntent deleteIntent; public PendingIntent deleteIntent;
/** /**
* An intent to launch instead of posting the notification to the status bar. Only for use with * An intent to launch instead of posting the notification to the status bar.
* extremely high-priority notifications demanding the user's attention, such as an incoming * Only for use with extremely high-priority notifications demanding the user's
* <strong>immediate</strong>attention, such as an incoming phone call or
* alarm clock that the user has explicitly set to a particular time.
* call (handled in the core Android Phone app with a full-screen Activity). * call (handled in the core Android Phone app with a full-screen Activity).
* If this facility is used for something else, please give the user an option
* to turn it off and use a normal notification, as this can be extremely
* disruptive.
*/ */
public PendingIntent fullScreenIntent; public PendingIntent fullScreenIntent;