summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorGriff Hazen <griff@google.com>2014-05-16 15:40:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-16 15:40:18 +0000
commitde35b636dfe5523dd9170d863248948852cd9cdb (patch)
tree48820c5214802383428716e2d54c03c52272efbd /api
parentb4606676a8e357f7b6de049099a04438f7c1b4eb (diff)
parent959591e3ba3934f5bd8ecc2c81ad2a16d226acab (diff)
downloadframeworks_base-de35b636dfe5523dd9170d863248948852cd9cdb.zip
frameworks_base-de35b636dfe5523dd9170d863248948852cd9cdb.tar.gz
frameworks_base-de35b636dfe5523dd9170d863248948852cd9cdb.tar.bz2
am 959591e3: Add support for extendable actions to Notification.
* commit '959591e3ba3934f5bd8ecc2c81ad2a16d226acab': Add support for extendable actions to Notification.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 144dbc0..7a67bd0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3984,6 +3984,7 @@ package android.app {
ctor public Notification.Action(int, java.lang.CharSequence, android.app.PendingIntent);
method public android.app.Notification.Action clone();
method public int describeContents();
+ method public android.os.Bundle getExtras();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
field public android.app.PendingIntent actionIntent;
@@ -3991,6 +3992,14 @@ package android.app {
field public java.lang.CharSequence title;
}
+ public static class Notification.Action.Builder {
+ ctor public Notification.Action.Builder(int, java.lang.CharSequence, android.app.PendingIntent);
+ ctor public Notification.Action.Builder(android.app.Notification.Action);
+ method public android.app.Notification.Action.Builder addExtras(android.os.Bundle);
+ method public android.app.Notification.Action build();
+ method public android.os.Bundle getExtras();
+ }
+
public static class Notification.BigPictureStyle extends android.app.Notification.Style {
ctor public Notification.BigPictureStyle();
ctor public Notification.BigPictureStyle(android.app.Notification.Builder);
@@ -4011,6 +4020,7 @@ package android.app {
public static class Notification.Builder {
ctor public Notification.Builder(android.content.Context);
method public android.app.Notification.Builder addAction(int, java.lang.CharSequence, android.app.PendingIntent);
+ method public android.app.Notification.Builder addAction(android.app.Notification.Action);
method public android.app.Notification.Builder addExtras(android.os.Bundle);
method public android.app.Notification build();
method public android.os.Bundle getExtras();