summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-03-24 11:02:36 -0400
committerJohn Spurlock <jspurlock@google.com>2014-03-24 11:02:36 -0400
commitcf44a124ab4eca431b3c57776183cd3857113e6f (patch)
tree463771f3f2ca52d6138c64013eade996f2dac487 /api
parentc01e1aeb0d86bd626684c97d709d4a8e995fddfb (diff)
downloadframeworks_base-cf44a124ab4eca431b3c57776183cd3857113e6f.zip
frameworks_base-cf44a124ab4eca431b3c57776183cd3857113e6f.tar.gz
frameworks_base-cf44a124ab4eca431b3c57776183cd3857113e6f.tar.bz2
Unhide Notification kind, rename to category.
Change-Id: I8e6d5a30dff519d7ed4f38e018646dd2bc55db33
Diffstat (limited to 'api')
-rw-r--r--api/current.txt16
1 files changed, 16 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 9312ed6..c3addd6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3919,6 +3919,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
@@ -3959,6 +3973,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;
@@ -4017,6 +4032,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);