Merge "Ensure NotificationCompat.MediaStyle methods return MediaStyle" into lmp-mr1-ub-dev
diff --git a/v7/appcompat/api/current.txt b/v7/appcompat/api/current.txt
index 1a8fb3b..fd3f7c3 100644
--- a/v7/appcompat/api/current.txt
+++ b/v7/appcompat/api/current.txt
@@ -293,10 +293,10 @@
public static class NotificationCompat.MediaStyle extends android.support.v4.app.NotificationCompat.Style {
ctor public NotificationCompat.MediaStyle();
ctor public NotificationCompat.MediaStyle(android.support.v4.app.NotificationCompat.Builder);
- method public void setCancelButtonIntent(android.app.PendingIntent);
+ method public android.support.v7.app.NotificationCompat.MediaStyle setCancelButtonIntent(android.app.PendingIntent);
method public android.support.v7.app.NotificationCompat.MediaStyle setMediaSession(android.support.v4.media.session.MediaSessionCompat.Token);
method public android.support.v7.app.NotificationCompat.MediaStyle setShowActionsInCompactView(int...);
- method public void setShowCancelButton(boolean);
+ method public android.support.v7.app.NotificationCompat.MediaStyle setShowCancelButton(boolean);
}
}
diff --git a/v7/appcompat/src/android/support/v7/app/NotificationCompat.java b/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
index 79e6bc4..689d47f 100644
--- a/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
+++ b/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
@@ -223,8 +223,9 @@
*
* @param show whether to show a cancel button
*/
- public void setShowCancelButton(boolean show) {
+ public MediaStyle setShowCancelButton(boolean show) {
mShowCancelButton = show;
+ return this;
}
/**
@@ -233,8 +234,9 @@
*
* @param pendingIntent the intent to be sent when the cancel button is pressed
*/
- public void setCancelButtonIntent(PendingIntent pendingIntent) {
+ public MediaStyle setCancelButtonIntent(PendingIntent pendingIntent) {
mCancelButtonIntent = pendingIntent;
+ return this;
}
}
}