diff options
| author | Griff Hazen <griff@google.com> | 2014-05-16 10:13:26 -0700 |
|---|---|---|
| committer | Griff Hazen <griff@google.com> | 2014-05-16 10:13:26 -0700 |
| commit | c091ba8dd085871a137600bdc82e3b902fb544f5 (patch) | |
| tree | 4fc1d8df8215ffa20c35e67eddf8b364c4ac0de3 /api | |
| parent | c40c0c9d9cbf57ca731570ece2c26e80a898e948 (diff) | |
| parent | de35b636dfe5523dd9170d863248948852cd9cdb (diff) | |
| download | frameworks_base-c091ba8dd085871a137600bdc82e3b902fb544f5.zip frameworks_base-c091ba8dd085871a137600bdc82e3b902fb544f5.tar.gz frameworks_base-c091ba8dd085871a137600bdc82e3b902fb544f5.tar.bz2 | |
resolved conflicts for merge of de35b636 to master
Conflicts:
core/java/android/app/Notification.java
Change-Id: I39ace14c976431bd7f6f1f9d5e4174b0a100aab0
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 91f20b7..67f33f4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4515,6 +4515,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; @@ -4522,6 +4523,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); @@ -4542,6 +4551,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.Builder addPerson(java.lang.String); method public android.app.Notification build(); |