Merge "Fix doc of fullScreenIntent." into gingerbread

This commit is contained in:
Dianne Hackborn
2010-09-09 21:31:08 -07:00
committed by Android (Google) Code Review

View File

@@ -113,7 +113,6 @@ public class Notification implements Parcelable
* Only for use with extremely high-priority notifications demanding the user's * Only for use with extremely high-priority notifications demanding the user's
* <strong>immediate</strong> attention, such as an incoming phone call or * <strong>immediate</strong> attention, such as an incoming phone call or
* alarm clock that the user has explicitly set to a particular time. * 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).
* If this facility is used for something else, please give the user an option * 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 * to turn it off and use a normal notification, as this can be extremely
* disruptive. * disruptive.