diff options
| author | Dan Sandler <dsandler@android.com> | 2015-05-13 23:41:13 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2015-07-17 00:59:20 +0000 |
| commit | 86647987c3c6bf4e6a8bacd763ff16f1806c70a3 (patch) | |
| tree | a3fe3edfc072c88f336e1549f8d69ee24f557602 /api/current.txt | |
| parent | 5536bb48b2829f04f9a8258bfe698e5e4a26f234 (diff) | |
| download | frameworks_base-86647987c3c6bf4e6a8bacd763ff16f1806c70a3.zip frameworks_base-86647987c3c6bf4e6a8bacd763ff16f1806c70a3.tar.gz frameworks_base-86647987c3c6bf4e6a8bacd763ff16f1806c70a3.tar.bz2 | |
Icon-related Notifications API changes:
- Deprecate Notification.icon and largeIcon.
setSmallIcon(Icon) and setLargeIcon(Icon) should be used
instead.
- Add Icon support to Notification actions; deprecate
Action.icon and methods/ctors that use int.
Bug: 21310773
Bug: 21271587
Change-Id: Iddac8121e7690e9d7a0360edb488ab77e3e8fb3a
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index f4f91a7..4a7dc82 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4772,9 +4772,9 @@ package android.app { field public int flags; field public android.app.PendingIntent fullScreenIntent; field public android.widget.RemoteViews headsUpContentView; - field public int icon; + field public deprecated int icon; field public int iconLevel; - field public android.graphics.Bitmap largeIcon; + field public deprecated android.graphics.Bitmap largeIcon; field public int ledARGB; field public int ledOffMS; field public int ledOnMS; @@ -4790,20 +4790,22 @@ package android.app { } public static class Notification.Action implements android.os.Parcelable { - ctor public Notification.Action(int, java.lang.CharSequence, android.app.PendingIntent); + ctor public deprecated 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 android.graphics.drawable.Icon getIcon(); method public android.app.RemoteInput[] getRemoteInputs(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.app.Notification.Action> CREATOR; field public android.app.PendingIntent actionIntent; - field public int icon; + field public deprecated int icon; field public java.lang.CharSequence title; } public static final class Notification.Action.Builder { - ctor public Notification.Action.Builder(int, java.lang.CharSequence, android.app.PendingIntent); + ctor public deprecated Notification.Action.Builder(int, java.lang.CharSequence, android.app.PendingIntent); + ctor public Notification.Action.Builder(android.graphics.drawable.Icon, 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.Builder addRemoteInput(android.app.RemoteInput); @@ -4851,7 +4853,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 deprecated 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.Builder addPerson(java.lang.String); |