diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-02-24 10:53:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-24 10:53:42 -0800 |
| commit | 3f0c58eb708ca520e84396fe764147800395812f (patch) | |
| tree | 550651c9789b6950c1e3cc8e1c90fe084ba3ca71 /api | |
| parent | 525ece4098a636818148dd5a660ebe4d7a2138af (diff) | |
| parent | 2561b0b10a55841a08e0e1d467e73e10b1bf256d (diff) | |
| download | frameworks_base-3f0c58eb708ca520e84396fe764147800395812f.zip frameworks_base-3f0c58eb708ca520e84396fe764147800395812f.tar.gz frameworks_base-3f0c58eb708ca520e84396fe764147800395812f.tar.bz2 | |
Merge "New notification priority and related APIs."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 0a83fe0..66c8eb2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3631,12 +3631,22 @@ package android.app { field public static final int DEFAULT_VIBRATE = 2; // 0x2 field public static final int FLAG_AUTO_CANCEL = 16; // 0x10 field public static final int FLAG_FOREGROUND_SERVICE = 64; // 0x40 - field public static final int FLAG_HIGH_PRIORITY = 128; // 0x80 + field public static final deprecated int FLAG_HIGH_PRIORITY = 128; // 0x80 field public static final int FLAG_INSISTENT = 4; // 0x4 field public static final int FLAG_NO_CLEAR = 32; // 0x20 field public static final int FLAG_ONGOING_EVENT = 2; // 0x2 field public static final int FLAG_ONLY_ALERT_ONCE = 8; // 0x8 field public static final int FLAG_SHOW_LIGHTS = 1; // 0x1 + field public static final java.lang.String KIND_CALL = "android.call"; + field public static final java.lang.String KIND_EMAIL = "android.email"; + field public static final java.lang.String KIND_EVENT = "android.event"; + field public static final java.lang.String KIND_MESSAGE = "android.message"; + field public static final java.lang.String KIND_PROMO = "android.promo"; + field public static final int PRIORITY_DEFAULT = 0; // 0x0 + field public static final int PRIORITY_HIGH = 1; // 0x1 + field public static final int PRIORITY_LOW = -1; // 0xffffffff + 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 int audioStreamType; field public android.app.PendingIntent contentIntent; @@ -3647,11 +3657,13 @@ package android.app { field public android.app.PendingIntent fullScreenIntent; field public int icon; field public int iconLevel; + field public java.lang.String[] kind; field public android.graphics.Bitmap largeIcon; field public int ledARGB; field public int ledOffMS; field public int ledOnMS; field public int number; + field public int priority; field public android.net.Uri sound; field public java.lang.CharSequence tickerText; field public android.widget.RemoteViews tickerView; @@ -3661,6 +3673,7 @@ package android.app { public static class Notification.Builder { ctor public Notification.Builder(android.content.Context); + method public android.app.Notification.Builder addKind(java.lang.String); method public android.app.Notification getNotification(); method public android.app.Notification.Builder setAutoCancel(boolean); method public android.app.Notification.Builder setContent(android.widget.RemoteViews); @@ -3676,6 +3689,7 @@ package android.app { method public android.app.Notification.Builder setNumber(int); method public android.app.Notification.Builder setOngoing(boolean); method public android.app.Notification.Builder setOnlyAlertOnce(boolean); + method public android.app.Notification.Builder setPriority(int); method public android.app.Notification.Builder setProgress(int, int, boolean); method public android.app.Notification.Builder setSmallIcon(int); method public android.app.Notification.Builder setSmallIcon(int, int); |