diff options
| author | Adam Powell <adamp@google.com> | 2012-06-14 18:30:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-14 18:30:55 -0700 |
| commit | 2f115bc007b24144f3f673395bc83ac0bc3814c7 (patch) | |
| tree | b1cbe59f601242e15281b3c38adaa0d9d8325090 /api/current.txt | |
| parent | 88c06995395d20aea8e0c2dda6118bd938423cfa (diff) | |
| parent | 13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2 (diff) | |
| download | frameworks_base-2f115bc007b24144f3f673395bc83ac0bc3814c7.zip frameworks_base-2f115bc007b24144f3f673395bc83ac0bc3814c7.tar.gz frameworks_base-2f115bc007b24144f3f673395bc83ac0bc3814c7.tar.bz2 | |
am 13b5c194: am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev
* commit '13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2':
API updates for MediaRouter
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 1c9d221..d1e1d47 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11530,6 +11530,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(); @@ -11543,7 +11544,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); @@ -11555,6 +11557,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(); @@ -11576,11 +11579,12 @@ package android.media { 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); @@ -11596,6 +11600,7 @@ package android.media { 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); |