Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev

Browse Source
This commit is contained in:
Griff Hazen
2014-03-06 02:05:37 +00:00
committed by Android (Google) Code Review
parent dd9f7cb294 720042b72f
commit c748341af5
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -4010,7 +4010,9 @@ 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 addExtras(android.os.Bundle);
method public android.app.Notification build();
method public android.os.Bundle getExtras();
method public deprecated android.app.Notification getNotification();
method public android.app.Notification.Builder setAutoCancel(boolean);
method public android.app.Notification.Builder setContent(android.widget.RemoteViews);

44
core/java/android/app/Notification.java
View File

@@ -1586,12 +1586,31 @@ public class Notification implements Parcelable
}
/**
* Add metadata to this notification.
* Merge additional metadata into this notification.
*
* A reference to the Bundle is held for the lifetime of this Builder, and the Bundle's
* <p>Values within the Bundle will replace existing extras values in this Builder.
*
* @see Notification#extras
*/
public Builder addExtras(Bundle bag) {
if (mExtras == null) {
mExtras = new Bundle(bag);
} else {
mExtras.putAll(bag);
}
return this;
}
/**
* Set metadata for this notification.
*
* <p>A reference to the Bundle is held for the lifetime of this Builder, and the Bundle's
* current contents are copied into the Notification each time {@link #build()} is
* called.
*
* <p>Replaces any existing extras values with those from the provided Bundle.
* Use {@link #addExtras} to merge in metadata instead.
*
* @see Notification#extras
*/
public Builder setExtras(Bundle bag) {
@@ -1599,6 +1618,23 @@ public class Notification implements Parcelable
return this;
}
/**
* Get the current metadata Bundle used by this notification Builder.
*
* <p>The returned Bundle is shared with this Builder.
*
* <p>The current contents of this Bundle are copied into the Notification each time
* {@link #build()} is called.
*
* @see Notification#extras
*/
public Bundle getExtras() {
if (mExtras == null) {
mExtras = new Bundle();
}
return mExtras;
}
/**
* Add an action to this notification. Actions are typically displayed by
* the system as a button adjacent to the notification content.
@@ -1857,7 +1893,7 @@ public class Notification implements Parcelable
* this Notification object.
* @hide
*/
public void addExtras(Bundle extras) {
public void populateExtras(Bundle extras) {
// Store original information used in the construction of this object
extras.putCharSequence(EXTRA_TITLE, mContentTitle);
extras.putCharSequence(EXTRA_TEXT, mContentText);
@@ -1895,7 +1931,7 @@ public class Notification implements Parcelable
n.extras = mExtras != null ? new Bundle(mExtras) : new Bundle();
addExtras(n.extras);
populateExtras(n.extras);
if (mStyle != null) {
mStyle.addExtras(n.extras);
}