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

Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2012-06-20 16:41:44 -07:00
committed by Android (Google) Code Review
parent fc178e381d 2cd5d25378
commit bd6b1820d9
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/current.txt
View File

@@ -11565,10 +11565,19 @@ package android.media {
method public android.graphics.drawable.Drawable getIconDrawable(); method public android.graphics.drawable.Drawable getIconDrawable();
method public java.lang.CharSequence getName(); method public java.lang.CharSequence getName();
method public java.lang.CharSequence getName(android.content.Context); 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 java.lang.CharSequence getStatus();
method public int getSupportedTypes(); method public int getSupportedTypes();
method public java.lang.Object getTag(); 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); 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 { 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 setIconResource(int);
method public void setName(java.lang.CharSequence); method public void setName(java.lang.CharSequence);
method public void setName(int); 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 setRemoteControlClient(android.media.RemoteControlClient);
method public void setStatus(java.lang.CharSequence); 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 { public class MediaScannerConnection implements android.content.ServiceConnection {

16
media/java/android/media/MediaRouter.java
View File

@@ -600,21 +600,18 @@ public class MediaRouter {
private Object mTag; private Object mTag;
/** /**
* @hide (to be un-hidden)
* The default playback type, "local", indicating the presentation of the media is happening * The default playback type, "local", indicating the presentation of the media is happening
* on the same device (e.g. a phone, a tablet) as where it is controlled from. * on the same device (e.g. a phone, a tablet) as where it is controlled from.
* @see #setPlaybackType(int) * @see #setPlaybackType(int)
*/ */
public final static int PLAYBACK_TYPE_LOCAL = 0; public final static int PLAYBACK_TYPE_LOCAL = 0;
/** /**
* @hide (to be un-hidden)
* A playback type indicating the presentation of the media is happening on * A playback type indicating the presentation of the media is happening on
* a different device (i.e. the remote device) than where it is controlled from. * a different device (i.e. the remote device) than where it is controlled from.
* @see #setPlaybackType(int) * @see #setPlaybackType(int)
*/ */
public final static int PLAYBACK_TYPE_REMOTE = 1; public final static int PLAYBACK_TYPE_REMOTE = 1;
/** /**
* @hide (to be un-hidden)
* Playback information indicating the playback volume is fixed, i.e. it cannot be * Playback information indicating the playback volume is fixed, i.e. it cannot be
* controlled from this object. An example of fixed playback volume is a remote player, * controlled from this object. An example of fixed playback volume is a remote player,
* playing over HDMI where the user prefers to control the volume on the HDMI sink, rather * playing over HDMI where the user prefers to control the volume on the HDMI sink, rather
@@ -623,7 +620,6 @@ public class MediaRouter {
*/ */
public final static int PLAYBACK_VOLUME_FIXED = 0; public final static int PLAYBACK_VOLUME_FIXED = 0;
/** /**
* @hide (to be un-hidden)
* Playback information indicating the playback volume is variable and can be controlled * Playback information indicating the playback volume is variable and can be controlled
* from this object. * from this object.
*/ */
@@ -723,7 +719,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* @return the type of playback associated with this route * @return the type of playback associated with this route
* @see UserRouteInfo#setPlaybackType(int) * @see UserRouteInfo#setPlaybackType(int)
*/ */
@@ -732,7 +727,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* @return the stream over which the playback associated with this route is performed * @return the stream over which the playback associated with this route is performed
* @see UserRouteInfo#setPlaybackStream(int) * @see UserRouteInfo#setPlaybackStream(int)
*/ */
@@ -741,7 +735,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* @return the volume at which the playback associated with this route is performed * @return the volume at which the playback associated with this route is performed
* @see UserRouteInfo#setVolume(int) * @see UserRouteInfo#setVolume(int)
*/ */
@@ -760,7 +753,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* @return the maximum volume at which the playback associated with this route is performed * @return the maximum volume at which the playback associated with this route is performed
* @see UserRouteInfo#setVolumeMax(int) * @see UserRouteInfo#setVolumeMax(int)
*/ */
@@ -779,7 +771,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* @return how volume is handling on the route * @return how volume is handling on the route
* @see UserRouteInfo#setVolumeHandling(int) * @see UserRouteInfo#setVolumeHandling(int)
*/ */
@@ -918,7 +909,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* Set a callback to be notified of volume update requests * Set a callback to be notified of volume update requests
* @param vcb * @param vcb
*/ */
@@ -927,7 +917,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* Defines whether playback associated with this route is "local" * Defines whether playback associated with this route is "local"
* ({@link RouteInfo#PLAYBACK_TYPE_LOCAL}) or "remote" * ({@link RouteInfo#PLAYBACK_TYPE_LOCAL}) or "remote"
* ({@link RouteInfo#PLAYBACK_TYPE_REMOTE}). * ({@link RouteInfo#PLAYBACK_TYPE_REMOTE}).
@@ -941,7 +930,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* Defines whether volume for the playback associated with this route is fixed * Defines whether volume for the playback associated with this route is fixed
* ({@link RouteInfo#PLAYBACK_VOLUME_FIXED}) or can modified * ({@link RouteInfo#PLAYBACK_VOLUME_FIXED}) or can modified
* ({@link RouteInfo#PLAYBACK_VOLUME_VARIABLE}). * ({@link RouteInfo#PLAYBACK_VOLUME_VARIABLE}).
@@ -956,7 +944,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* Defines at what volume the playback associated with this route is performed (for user * Defines at what volume the playback associated with this route is performed (for user
* feedback purposes). This information is only used when the playback is not local. * feedback purposes). This information is only used when the playback is not local.
* @param volume * @param volume
@@ -969,7 +956,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* Defines the maximum volume at which the playback associated with this route is performed * Defines the maximum volume at which the playback associated with this route is performed
* (for user feedback purposes). This information is only used when the playback is not * (for user feedback purposes). This information is only used when the playback is not
* local. * local.
@@ -983,7 +969,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* Defines over what stream type the media is presented. * Defines over what stream type the media is presented.
* @param stream * @param stream
*/ */
@@ -1447,7 +1432,6 @@ public class MediaRouter {
} }
/** /**
* @hide (to be un-hidden)
* Interface for receiving events about volume changes. * Interface for receiving events about volume changes.
* All methods of this interface will be called from the application's main thread. * All methods of this interface will be called from the application's main thread.
* *