More MediaRouter features. (ae20ae1a) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -11548,11 +11548,14 @@ package android.media {
		method public int getRouteCount();
		method public void removeRoute(android.media.MediaRouter.RouteInfo);
		method public void removeRoute(int);
		method public void setIconDrawable(android.graphics.drawable.Drawable);
		method public void setIconResource(int);
		}

		public static class MediaRouter.RouteInfo {
		method public android.media.MediaRouter.RouteCategory getCategory();
		method public android.media.MediaRouter.RouteGroup getGroup();
		method public android.graphics.drawable.Drawable getIconDrawable();
		method public java.lang.CharSequence getName();
		method public java.lang.CharSequence getStatus();
		method public int getSupportedTypes();
		@@ -11570,7 +11573,10 @@ package android.media {
		}

		public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {
		method public void setIconDrawable(android.graphics.drawable.Drawable);
		method public void setIconResource(int);
		method public void setName(java.lang.CharSequence);
		method public void setRemoteControlClient(android.media.RemoteControlClient);
		method public void setStatus(java.lang.CharSequence);
		}

media/java/android/media/MediaRouter.java

+67 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.res.Resources;
		import android.graphics.drawable.Drawable;
		import android.os.Handler;
		import android.util.Log;

		@@ -492,6 +493,7 @@ public class MediaRouter {
		int mSupportedTypes;
		RouteGroup mGroup;
		final RouteCategory mCategory;
		Drawable mIcon;

		RouteInfo(RouteCategory category) {
		mCategory = category;
		@@ -534,6 +536,16 @@ public class MediaRouter {
		return mCategory;
		}

		/**
		* Get the icon representing this route.
		* This icon will be used in picker UIs if available.
		*
		* @return the icon representing this route or null if no icon is available
		*/
		public Drawable getIconDrawable() {
		return mIcon;
		}

		void setStatusInt(CharSequence status) {
		if (!status.equals(mStatus)) {
		mStatus = status;
		@@ -564,6 +576,7 @@ public class MediaRouter {
		* @see MediaRouter.RouteInfo
		*/
		public static class UserRouteInfo extends RouteInfo {
		RemoteControlClient mRcc;

		UserRouteInfo(RouteCategory category) {
		super(category);
		@@ -587,6 +600,40 @@ public class MediaRouter {
		public void setStatus(CharSequence status) {
		setStatusInt(status);
		}

		/**
		* Set the RemoteControlClient responsible for reporting playback info for this
		* user route.
		*
		* <p>If this route manages remote playback, the data exposed by this
		* RemoteControlClient will be used to reflect and update information
		* such as route volume info in related UIs.</p>
		*
		* @param rcc RemoteControlClient associated with this route
		*/
		public void setRemoteControlClient(RemoteControlClient rcc) {
		mRcc = rcc;
		}

		/**
		* Set an icon that will be used to represent this route.
		* The system may use this icon in picker UIs or similar.
		*
		* @param icon icon drawable to use to represent this route
		*/
		public void setIconDrawable(Drawable icon) {
		mIcon = icon;
		}

		/**
		* Set an icon that will be used to represent this route.
		* The system may use this icon in picker UIs or similar.
		*
		* @param icon Resource ID of an icon drawable to use to represent this route
		*/
		public void setIconResource(int resId) {
		setIconDrawable(sStatic.mResources.getDrawable(resId));
		}
		}

		/**
		@@ -695,6 +742,26 @@ public class MediaRouter {
		return mRoutes.get(index);
		}

		/**
		* Set an icon that will be used to represent this group.
		* The system may use this icon in picker UIs or similar.
		*
		* @param icon icon drawable to use to represent this group
		*/
		public void setIconDrawable(Drawable icon) {
		mIcon = icon;
		}

		/**
		* Set an icon that will be used to represent this group.
		* The system may use this icon in picker UIs or similar.
		*
		* @param icon Resource ID of an icon drawable to use to represent this group
		*/
		public void setIconResource(int resId) {
		setIconDrawable(sStatic.mResources.getDrawable(resId));
		}

		void memberNameChanged(RouteInfo info, CharSequence name) {
		mUpdateName = true;
		routeUpdated();