diff options
| -rw-r--r-- | api/current.txt | 32 | ||||
| -rw-r--r-- | core/java/android/app/Notification.java | 23 |
2 files changed, 32 insertions, 23 deletions
diff --git a/api/current.txt b/api/current.txt index b7c1bbd..854ead8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3845,6 +3845,23 @@ package android.app { field public static final int DEFAULT_LIGHTS = 4; // 0x4 field public static final int DEFAULT_SOUND = 1; // 0x1 field public static final int DEFAULT_VIBRATE = 2; // 0x2 + field public static final java.lang.String EXTRA_INFO_TEXT = "android.infoText"; + field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon"; + field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big"; + field public static final java.lang.String EXTRA_PEOPLE = "android.people"; + field public static final java.lang.String EXTRA_PICTURE = "android.picture"; + field public static final java.lang.String EXTRA_PROGRESS = "android.progress"; + field public static final java.lang.String EXTRA_PROGRESS_INDETERMINATE = "android.progressIndeterminate"; + field public static final java.lang.String EXTRA_PROGRESS_MAX = "android.progressMax"; + field public static final java.lang.String EXTRA_SHOW_CHRONOMETER = "android.showChronometer"; + field public static final java.lang.String EXTRA_SHOW_WHEN = "android.showWhen"; + field public static final java.lang.String EXTRA_SMALL_ICON = "android.icon"; + field public static final java.lang.String EXTRA_SUB_TEXT = "android.subText"; + field public static final java.lang.String EXTRA_SUMMARY_TEXT = "android.summaryText"; + field public static final java.lang.String EXTRA_TEXT = "android.text"; + field public static final java.lang.String EXTRA_TEXT_LINES = "android.textLines"; + field public static final java.lang.String EXTRA_TITLE = "android.title"; + field public static final java.lang.String EXTRA_TITLE_BIG = "android.title.big"; field public static final int FLAG_AUTO_CANCEL = 16; // 0x10 field public static final int FLAG_FOREGROUND_SERVICE = 64; // 0x40 field public static final deprecated int FLAG_HIGH_PRIORITY = 128; // 0x80 @@ -3859,12 +3876,14 @@ package android.app { field public static final int PRIORITY_MAX = 2; // 0x2 field public static final int PRIORITY_MIN = -2; // 0xfffffffe field public static final int STREAM_DEFAULT = -1; // 0xffffffff + field public android.app.Notification.Action[] actions; field public int audioStreamType; field public android.widget.RemoteViews bigContentView; field public android.app.PendingIntent contentIntent; field public android.widget.RemoteViews contentView; field public int defaults; field public android.app.PendingIntent deleteIntent; + field public android.os.Bundle extras; field public int flags; field public android.app.PendingIntent fullScreenIntent; field public int icon; @@ -3882,6 +3901,18 @@ package android.app { field public long when; } + public static class Notification.Action implements android.os.Parcelable { + ctor public Notification.Action(); + ctor public Notification.Action(int, java.lang.CharSequence, android.app.PendingIntent); + method public android.app.Notification.Action clone(); + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + field public android.app.PendingIntent actionIntent; + field public int icon; + field public java.lang.CharSequence title; + } + public static class Notification.BigPictureStyle extends android.app.Notification.Style { ctor public Notification.BigPictureStyle(); ctor public Notification.BigPictureStyle(android.app.Notification.Builder); @@ -3914,6 +3945,7 @@ package android.app { method public android.app.Notification.Builder setContentTitle(java.lang.CharSequence); method public android.app.Notification.Builder setDefaults(int); method public android.app.Notification.Builder setDeleteIntent(android.app.PendingIntent); + method public android.app.Notification.Builder setExtras(android.os.Bundle); method public android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean); method public android.app.Notification.Builder setLargeIcon(android.graphics.Bitmap); method public android.app.Notification.Builder setLights(int, int, int); diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index fb28ae3..7a0f376 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -432,51 +432,32 @@ public class Notification implements Parcelable /** * Additional semantic data to be carried around with this Notification. - * @hide */ public Bundle extras = new Bundle(); // extras keys for Builder inputs - /** @hide */ public static final String EXTRA_TITLE = "android.title"; - /** @hide */ public static final String EXTRA_TITLE_BIG = EXTRA_TITLE + ".big"; - /** @hide */ public static final String EXTRA_TEXT = "android.text"; - /** @hide */ public static final String EXTRA_SUB_TEXT = "android.subText"; - /** @hide */ public static final String EXTRA_INFO_TEXT = "android.infoText"; - /** @hide */ public static final String EXTRA_SUMMARY_TEXT = "android.summaryText"; - /** @hide */ public static final String EXTRA_SMALL_ICON = "android.icon"; - /** @hide */ public static final String EXTRA_LARGE_ICON = "android.largeIcon"; - /** @hide */ public static final String EXTRA_LARGE_ICON_BIG = EXTRA_LARGE_ICON + ".big"; - /** @hide */ public static final String EXTRA_PROGRESS = "android.progress"; - /** @hide */ public static final String EXTRA_PROGRESS_MAX = "android.progressMax"; - /** @hide */ public static final String EXTRA_PROGRESS_INDETERMINATE = "android.progressIndeterminate"; - /** @hide */ public static final String EXTRA_SHOW_CHRONOMETER = "android.showChronometer"; - /** @hide */ public static final String EXTRA_SHOW_WHEN = "android.showWhen"; - /** @hide from BigPictureStyle */ public static final String EXTRA_PICTURE = "android.picture"; - /** @hide from InboxStyle */ public static final String EXTRA_TEXT_LINES = "android.textLines"; // extras keys for other interesting pieces of information - /** @hide */ public static final String EXTRA_PEOPLE = "android.people"; /** * Structure to encapsulate an "action", including title and icon, that can be attached to a Notification. - * @hide */ public static class Action implements Parcelable { public int icon; @@ -530,9 +511,6 @@ public class Notification implements Parcelable }; } - /** - * @hide - */ public Action[] actions; /** @@ -1450,7 +1428,6 @@ public class Notification implements Parcelable * called. * * @see Notification#extras - * @hide */ public Builder setExtras(Bundle bag) { mExtras = bag; |