diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-06-20 16:46:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-20 16:46:55 -0700 |
| commit | ecab2aab19263826447cfed1586232d2e8672139 (patch) | |
| tree | be4feb28ea217e80333cf39b2ed859152befebbb /api | |
| parent | 63258b253ccce8add3fd424c5a05998cdf179c2e (diff) | |
| parent | e44440f40c6b005dce2eba1b37b3cabe97133152 (diff) | |
| download | frameworks_base-ecab2aab19263826447cfed1586232d2e8672139.zip frameworks_base-ecab2aab19263826447cfed1586232d2e8672139.tar.gz frameworks_base-ecab2aab19263826447cfed1586232d2e8672139.tar.bz2 | |
am e44440f4: am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev
* commit 'e44440f40c6b005dce2eba1b37b3cabe97133152':
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 862d326..4fb41c1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11581,10 +11581,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 { @@ -11604,8 +11613,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 { |