diff options
| author | Dan Sandler <dsandler@android.com> | 2014-05-08 11:34:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 11:34:31 +0000 |
| commit | fea08f22de9b4bc165c046ee9bbceff81aeb4da4 (patch) | |
| tree | b3fe0b59ca4eb045d7f2241fc5257425519e47d4 /api | |
| parent | 34a6418cba68d2e8b0f710c51111330349dcc0ba (diff) | |
| parent | b325c80d3da0c14107597a4c5423dba938e1a633 (diff) | |
| download | frameworks_base-fea08f22de9b4bc165c046ee9bbceff81aeb4da4.zip frameworks_base-fea08f22de9b4bc165c046ee9bbceff81aeb4da4.tar.gz frameworks_base-fea08f22de9b4bc165c046ee9bbceff81aeb4da4.tar.bz2 | |
am 20d80a4a: Merge "Quantum notification improvements."
* commit '20d80a4a05249fca9f4aa6c80b61a1f7a9e18dd0':
Quantum notification improvements.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 5d7c400..4e3ee3c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4438,6 +4438,7 @@ package android.app { field public static final java.lang.String CATEGORY_STATUS = "status"; field public static final java.lang.String CATEGORY_SYSTEM = "sys"; field public static final java.lang.String CATEGORY_TRANSPORT = "transport"; + field public static final int COLOR_DEFAULT = 0; // 0x0 field public static final android.os.Parcelable.Creator CREATOR; field public static final int DEFAULT_ALL = -1; // 0xffffffff field public static final int DEFAULT_LIGHTS = 4; // 0x4 @@ -4483,6 +4484,7 @@ package android.app { field public int audioStreamType; field public android.widget.RemoteViews bigContentView; field public java.lang.String category; + field public int color; field public android.app.PendingIntent contentIntent; field public android.widget.RemoteViews contentView; field public int defaults; @@ -4545,6 +4547,7 @@ package android.app { method public deprecated android.app.Notification getNotification(); method public android.app.Notification.Builder setAutoCancel(boolean); method public android.app.Notification.Builder setCategory(java.lang.String); + method public android.app.Notification.Builder setColor(int); method public android.app.Notification.Builder setContent(android.widget.RemoteViews); method public android.app.Notification.Builder setContentInfo(java.lang.CharSequence); method public android.app.Notification.Builder setContentIntent(android.app.PendingIntent); |