diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-06-20 16:43:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-20 16:43:55 -0700 |
| commit | e44440f40c6b005dce2eba1b37b3cabe97133152 (patch) | |
| tree | 40413b52fb2c7607129f9cc95c65f782afa9dcd2 /api | |
| parent | 7fe75d9759544d9b2eccac19aacb8c3992dfcc02 (diff) | |
| parent | bd6b1820d931ef11fc7fc5b8571a8265c1ed4994 (diff) | |
| download | frameworks_base-e44440f40c6b005dce2eba1b37b3cabe97133152.zip frameworks_base-e44440f40c6b005dce2eba1b37b3cabe97133152.tar.gz frameworks_base-e44440f40c6b005dce2eba1b37b3cabe97133152.tar.bz2 | |
am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev
* commit 'bd6b1820d931ef11fc7fc5b8571a8265c1ed4994':
Unhide new API in android.media.MediaRouter for remote playback
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 49c09b2..9de53d2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11565,10 +11565,19 @@ package android.media { method public android.graphics.drawable.Drawable getIconDrawable(); method public java.lang.CharSequence getName(); method public java.lang.CharSequence getName(android.content.Context); + method public int getPlaybackStream(); + method public int getPlaybackType(); method public java.lang.CharSequence getStatus(); method public int getSupportedTypes(); method public java.lang.Object getTag(); + method public int getVolume(); + method public int getVolumeHandling(); + method public int getVolumeMax(); method public void setTag(java.lang.Object); + field public static final int PLAYBACK_TYPE_LOCAL = 0; // 0x0 + field public static final int PLAYBACK_TYPE_REMOTE = 1; // 0x1 + field public static final int PLAYBACK_VOLUME_FIXED = 0; // 0x0 + field public static final int PLAYBACK_VOLUME_VARIABLE = 1; // 0x1 } public static class MediaRouter.SimpleCallback extends android.media.MediaRouter.Callback { @@ -11588,8 +11597,20 @@ package android.media { method public void setIconResource(int); method public void setName(java.lang.CharSequence); method public void setName(int); + method public void setPlaybackStream(int); + method public void setPlaybackType(int); method public void setRemoteControlClient(android.media.RemoteControlClient); method public void setStatus(java.lang.CharSequence); + method public void setVolume(int); + method public void setVolumeCallback(android.media.MediaRouter.VolumeCallback); + method public void setVolumeHandling(int); + method public void setVolumeMax(int); + } + + public static abstract class MediaRouter.VolumeCallback { + ctor public MediaRouter.VolumeCallback(); + method public abstract void onVolumeSetRequest(android.media.MediaRouter.RouteInfo, int); + method public abstract void onVolumeUpdateRequest(android.media.MediaRouter.RouteInfo, int); } public class MediaScannerConnection implements android.content.ServiceConnection { |