diff options
author | Adam Powell <adamp@google.com> | 2012-06-14 17:51:25 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-14 17:51:27 -0700 |
commit | 90b9f84c43145c51180c7253cd3a3f59862c2611 (patch) | |
tree | f71db8dd13a96e3d07eecc5712089eec4fb3df0a /api/16.txt | |
parent | 7661bc6c5afef4cca8ccee2f859906f8fb64087b (diff) | |
parent | 0d03c042f90bf62d5bad7c64e77028a5f9f8fae0 (diff) | |
download | frameworks_base-90b9f84c43145c51180c7253cd3a3f59862c2611.zip frameworks_base-90b9f84c43145c51180c7253cd3a3f59862c2611.tar.gz frameworks_base-90b9f84c43145c51180c7253cd3a3f59862c2611.tar.bz2 |
Merge "API updates for MediaRouter" into jb-dev
Diffstat (limited to 'api/16.txt')
-rw-r--r-- | api/16.txt | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -3679,6 +3679,7 @@ package android.app { public class MediaRouteActionProvider extends android.view.ActionProvider { ctor public MediaRouteActionProvider(android.content.Context); method public android.view.View onCreateActionView(); + method public void setExtendedSettingsClickListener(android.view.View.OnClickListener); method public void setRouteTypes(int); } @@ -3687,7 +3688,9 @@ package android.app { ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet); ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet, int); method public int getRouteTypes(); + method public void setExtendedSettingsClickListener(android.view.View.OnClickListener); method public void setRouteTypes(int); + method public void showDialog(); } public class NativeActivity extends android.app.Activity implements android.view.InputQueue.Callback android.view.SurfaceHolder.Callback2 android.view.ViewTreeObserver.OnGlobalLayoutListener { @@ -11511,6 +11514,7 @@ package android.media { method public void addUserRoute(android.media.MediaRouter.UserRouteInfo); method public void clearUserRoutes(); method public android.media.MediaRouter.RouteCategory createRouteCategory(java.lang.CharSequence, boolean); + method public android.media.MediaRouter.RouteCategory createRouteCategory(int, boolean); method public android.media.MediaRouter.UserRouteInfo createUserRoute(android.media.MediaRouter.RouteCategory); method public android.media.MediaRouter.RouteCategory getCategoryAt(int); method public int getCategoryCount(); @@ -11524,7 +11528,8 @@ package android.media { field public static final int ROUTE_TYPE_USER = 8388608; // 0x800000 } - public static abstract interface MediaRouter.Callback { + public static abstract class MediaRouter.Callback { + ctor public MediaRouter.Callback(); method public abstract void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); method public abstract void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); method public abstract void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int); @@ -11536,6 +11541,7 @@ package android.media { public static class MediaRouter.RouteCategory { method public java.lang.CharSequence getName(); + method public java.lang.CharSequence getName(android.content.Context); method public java.util.List<android.media.MediaRouter.RouteInfo> getRoutes(java.util.List<android.media.MediaRouter.RouteInfo>); method public int getSupportedTypes(); method public boolean isGroupable(); @@ -11548,17 +11554,21 @@ 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 getName(android.content.Context); method public java.lang.CharSequence getStatus(); method public int getSupportedTypes(); } - public static class MediaRouter.SimpleCallback implements android.media.MediaRouter.Callback { + public static class MediaRouter.SimpleCallback extends android.media.MediaRouter.Callback { ctor public MediaRouter.SimpleCallback(); method public void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); method public void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); @@ -11570,8 +11580,14 @@ package android.media { } public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo { + method public java.lang.Object getTag(); + method public void setIconDrawable(android.graphics.drawable.Drawable); + method public void setIconResource(int); method public void setName(java.lang.CharSequence); + method public void setName(int); + method public void setRemoteControlClient(android.media.RemoteControlClient); method public void setStatus(java.lang.CharSequence); + method public void setTag(java.lang.Object); } public class MediaScannerConnection implements android.content.ServiceConnection { |