Merge "Make MediaStyle#setRemotePlayback public" into udc-dev am: 506535c339
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22105404 Change-Id: I42937618a8a5a56845d5829c9f9328b7d2e6d1ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -6623,6 +6623,7 @@ package android.app {
|
||||
ctor public Notification.MediaStyle();
|
||||
ctor @Deprecated public Notification.MediaStyle(android.app.Notification.Builder);
|
||||
method public android.app.Notification.MediaStyle setMediaSession(android.media.session.MediaSession.Token);
|
||||
method @NonNull @RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL) public android.app.Notification.MediaStyle setRemotePlaybackInfo(@NonNull CharSequence, @DrawableRes int, @Nullable android.app.PendingIntent);
|
||||
method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
|
||||
}
|
||||
|
||||
|
||||
@@ -968,10 +968,6 @@ package android.app {
|
||||
field public static final int SEMANTIC_ACTION_MARK_CONVERSATION_AS_PRIORITY = 11; // 0xb
|
||||
}
|
||||
|
||||
public static class Notification.MediaStyle extends android.app.Notification.Style {
|
||||
method @NonNull @RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL) public android.app.Notification.MediaStyle setRemotePlaybackInfo(@NonNull CharSequence, @DrawableRes int, @Nullable android.app.PendingIntent);
|
||||
}
|
||||
|
||||
public static final class Notification.TvExtender implements android.app.Notification.Extender {
|
||||
ctor public Notification.TvExtender();
|
||||
ctor public Notification.TvExtender(android.app.Notification);
|
||||
|
||||
@@ -9163,10 +9163,7 @@ public class Notification implements Parcelable
|
||||
* {@code null}, in which case the output switcher will be disabled.
|
||||
* This intent should open an Activity or it will be ignored.
|
||||
* @return MediaStyle
|
||||
*
|
||||
* @hide
|
||||
*/
|
||||
@SystemApi
|
||||
@RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL)
|
||||
@NonNull
|
||||
public MediaStyle setRemotePlaybackInfo(@NonNull CharSequence deviceName,
|
||||
|
||||
Reference in New Issue
Block a user