diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-09 21:39:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 21:39:22 -0700 |
| commit | f22c30cd818db80e5c27d27c14b9dbe9507cef38 (patch) | |
| tree | 80821468d39a5256276fe8f2501756233cdde383 /core/java/android/app/Notification.java | |
| parent | c6ded1ba463f78bbb3bf21dc8362d599c7722e65 (diff) | |
| parent | 033b381b4c91aff4bf76481d0b37fb5f39b50ec2 (diff) | |
| download | frameworks_base-f22c30cd818db80e5c27d27c14b9dbe9507cef38.zip frameworks_base-f22c30cd818db80e5c27d27c14b9dbe9507cef38.tar.gz frameworks_base-f22c30cd818db80e5c27d27c14b9dbe9507cef38.tar.bz2 | |
am 033b381b: am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread
Merge commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2'
* commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2':
Fix doc of fullScreenIntent.
Diffstat (limited to 'core/java/android/app/Notification.java')
| -rw-r--r-- | core/java/android/app/Notification.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 9f7bef4..da000e5 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -111,9 +111,8 @@ public class Notification implements Parcelable /** * An intent to launch instead of posting the notification to the status bar. * 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. - * 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. |