diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-09 21:34:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 21:34:38 -0700 |
| commit | 033b381b4c91aff4bf76481d0b37fb5f39b50ec2 (patch) | |
| tree | c927d536cdb725408af2bde520ef9e9cc1b86f3b /core/java/android/app/Notification.java | |
| parent | 195dc210cb59ba3f660e31a95334fc3fa4d3ad2c (diff) | |
| parent | 7f07f842c9c375648b52de5d8a84c080e9394d71 (diff) | |
| download | frameworks_base-033b381b4c91aff4bf76481d0b37fb5f39b50ec2.zip frameworks_base-033b381b4c91aff4bf76481d0b37fb5f39b50ec2.tar.gz frameworks_base-033b381b4c91aff4bf76481d0b37fb5f39b50ec2.tar.bz2 | |
am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread
Merge commit '7f07f842c9c375648b52de5d8a84c080e9394d71' into gingerbread-plus-aosp
* commit '7f07f842c9c375648b52de5d8a84c080e9394d71':
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 63ad92a..856943d 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. |