diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-24 17:44:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 17:44:53 +0000 |
| commit | e2cae0a6578596f9c87b970650a9cc234b32cb04 (patch) | |
| tree | 0d59fd783ba51aa6673cad43d9751350eed7eb65 /api | |
| parent | d13d701681220cdcb61b5a62669e88bb77d156aa (diff) | |
| parent | 2b45d84e24946d0cbbcc577ca3e195c0db687c9a (diff) | |
| download | frameworks_base-e2cae0a6578596f9c87b970650a9cc234b32cb04.zip frameworks_base-e2cae0a6578596f9c87b970650a9cc234b32cb04.tar.gz frameworks_base-e2cae0a6578596f9c87b970650a9cc234b32cb04.tar.bz2 | |
am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit '2b45d84e24946d0cbbcc577ca3e195c0db687c9a':
Unhide Notification kind, rename to category.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 0072a5b..145c979 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3920,6 +3920,20 @@ package android.app { method public int describeContents(); method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); method public void writeToParcel(android.os.Parcel, int); + field public static final java.lang.String CATEGORY_ALARM = "alarm"; + field public static final java.lang.String CATEGORY_CALL = "call"; + field public static final java.lang.String CATEGORY_EMAIL = "email"; + field public static final java.lang.String CATEGORY_ERROR = "err"; + field public static final java.lang.String CATEGORY_EVENT = "event"; + field public static final java.lang.String CATEGORY_MESSAGE = "msg"; + field public static final java.lang.String CATEGORY_PROGRESS = "progress"; + field public static final java.lang.String CATEGORY_PROMO = "promo"; + field public static final java.lang.String CATEGORY_RECOMMENDATION = "recommendation"; + field public static final java.lang.String CATEGORY_SERVICE = "service"; + field public static final java.lang.String CATEGORY_SOCIAL = "social"; + 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 android.os.Parcelable.Creator CREATOR; field public static final int DEFAULT_ALL = -1; // 0xffffffff field public static final int DEFAULT_LIGHTS = 4; // 0x4 @@ -3960,6 +3974,7 @@ package android.app { field public android.app.Notification.Action[] actions; field public int audioStreamType; field public android.widget.RemoteViews bigContentView; + field public java.lang.String category; field public android.app.PendingIntent contentIntent; field public android.widget.RemoteViews contentView; field public int defaults; @@ -4018,6 +4033,7 @@ package android.app { method public android.os.Bundle getExtras(); 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 setContent(android.widget.RemoteViews); method public android.app.Notification.Builder setContentInfo(java.lang.CharSequence); method public android.app.Notification.Builder setContentIntent(android.app.PendingIntent); |