Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbce66cb authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Further work on MediaRouter" into jb-dev

parents 0d8eba64 d0d2cda9

api/16.txt

+90 −1
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ package android { 
    field public static final int maxWidth = 16843039; // 0x101011f

    field public static final int measureAllChildren = 16843018; // 0x101010a

    field public static final int measureWithLargestChild = 16843476; // 0x10102d4

    field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad

    field public static final int menuCategory = 16843230; // 0x10101de

    field public static final int mimeType = 16842790; // 0x1010026

    field public static final int minDate = 16843583; // 0x101033f
@@ -1789,6 +1790,7 @@ package android { 
    field public static final int Widget_DeviceDefault_Light_ListPopupWindow = 16974235; // 0x103019b

    field public static final int Widget_DeviceDefault_Light_ListView = 16974210; // 0x1030182

    field public static final int Widget_DeviceDefault_Light_ListView_DropDown = 16974205; // 0x103017d

    field public static final int Widget_DeviceDefault_Light_MediaRouteButton = 16974296; // 0x10301d8

    field public static final int Widget_DeviceDefault_Light_PopupMenu = 16974236; // 0x103019c

    field public static final int Widget_DeviceDefault_Light_PopupWindow = 16974211; // 0x1030183

    field public static final int Widget_DeviceDefault_Light_ProgressBar = 16974212; // 0x1030184
@@ -1814,6 +1816,7 @@ package android { 
    field public static final int Widget_DeviceDefault_ListPopupWindow = 16974180; // 0x1030164

    field public static final int Widget_DeviceDefault_ListView = 16974158; // 0x103014e

    field public static final int Widget_DeviceDefault_ListView_DropDown = 16974153; // 0x1030149

    field public static final int Widget_DeviceDefault_MediaRouteButton = 16974295; // 0x10301d7

    field public static final int Widget_DeviceDefault_PopupMenu = 16974181; // 0x1030165

    field public static final int Widget_DeviceDefault_PopupWindow = 16974159; // 0x103014f

    field public static final int Widget_DeviceDefault_ProgressBar = 16974160; // 0x1030150
@@ -1905,6 +1908,7 @@ package android { 
    field public static final int Widget_Holo_Light_ListPopupWindow = 16974043; // 0x10300db

    field public static final int Widget_Holo_Light_ListView = 16974018; // 0x10300c2

    field public static final int Widget_Holo_Light_ListView_DropDown = 16974013; // 0x10300bd

    field public static final int Widget_Holo_Light_MediaRouteButton = 16974294; // 0x10301d6

    field public static final int Widget_Holo_Light_PopupMenu = 16974044; // 0x10300dc

    field public static final int Widget_Holo_Light_PopupWindow = 16974019; // 0x10300c3

    field public static final int Widget_Holo_Light_ProgressBar = 16974020; // 0x10300c4
@@ -1930,6 +1934,7 @@ package android { 
    field public static final int Widget_Holo_ListPopupWindow = 16973997; // 0x10300ad

    field public static final int Widget_Holo_ListView = 16973975; // 0x1030097

    field public static final int Widget_Holo_ListView_DropDown = 16973970; // 0x1030092

    field public static final int Widget_Holo_MediaRouteButton = 16974293; // 0x10301d5

    field public static final int Widget_Holo_PopupMenu = 16973998; // 0x10300ae

    field public static final int Widget_Holo_PopupWindow = 16973976; // 0x1030098

    field public static final int Widget_Holo_ProgressBar = 16973977; // 0x1030099
@@ -3671,6 +3676,20 @@ package android.app { 
    method public android.view.Window startActivity(java.lang.String, android.content.Intent);

  }













  public class MediaRouteActionProvider extends android.view.ActionProvider {













    ctor public MediaRouteActionProvider(android.content.Context);













    method public android.view.View onCreateActionView();













    method public void setRouteTypes(int);













  }

























  public class MediaRouteButton extends android.view.View {













    ctor public MediaRouteButton(android.content.Context);













    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 setRouteTypes(int);













  }



























  public class NativeActivity extends android.app.Activity implements android.view.InputQueue.Callback android.view.SurfaceHolder.Callback2 android.view.ViewTreeObserver.OnGlobalLayoutListener {















    ctor public NativeActivity();















    method public void onGlobalLayout();










@@ -11486,6 +11505,75 @@ package android.media {













    field public static final int DEFAULT = 0; // 0x0















  }



























  public class MediaRouter {













    method public void addCallback(int, android.media.MediaRouter.Callback);













    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.UserRouteInfo createUserRoute(android.media.MediaRouter.RouteCategory);













    method public static android.media.MediaRouter forApplication(android.content.Context);













    method public android.media.MediaRouter.RouteCategory getCategoryAt(int);













    method public int getCategoryCount();













    method public android.media.MediaRouter.RouteInfo getRouteAt(int);













    method public int getRouteCount();













    method public android.media.MediaRouter.RouteInfo getSelectedRoute(int);













    method public void removeCallback(android.media.MediaRouter.Callback);













    method public void removeUserRoute(android.media.MediaRouter.UserRouteInfo);













    method public void selectRoute(int, android.media.MediaRouter.RouteInfo);













    field public static final int ROUTE_TYPE_LIVE_AUDIO = 1; // 0x1













    field public static final int ROUTE_TYPE_USER = 8388608; // 0x800000













  }

























  public static abstract interface 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);













    method public abstract void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);













    method public abstract void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);













    method public abstract void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup);













    method public abstract void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);













  }

























  public class MediaRouter.RouteCategory {













    method public java.lang.CharSequence getName();













    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();













  }

























  public class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo {













    method public void addRoute(android.media.MediaRouter.RouteInfo);













    method public void addRoute(android.media.MediaRouter.RouteInfo, int);













    method public android.media.MediaRouter.RouteInfo getRouteAt(int);













    method public int getRouteCount();













    method public void removeRoute(android.media.MediaRouter.RouteInfo);













    method public void removeRoute(int);













  }

























  public class MediaRouter.RouteInfo {













    method public android.media.MediaRouter.RouteCategory getCategory();













    method public android.media.MediaRouter.RouteGroup getGroup();













    method public java.lang.CharSequence getName();













    method public java.lang.CharSequence getStatus();













    method public int getSupportedTypes();













  }

























  public static class MediaRouter.SimpleCallback implements 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);













    method public void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int);













    method public void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);













    method public void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);













    method public void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup);













    method public void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);













  }

























  public class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {













    method public void setName(java.lang.CharSequence);













    method public void setStatus(java.lang.CharSequence);













  }



























  public class MediaScannerConnection implements android.content.ServiceConnection {















    ctor public MediaScannerConnection(android.content.Context, android.media.MediaScannerConnection.MediaScannerConnectionClient);















    method public void connect();










@@ -22710,7 +22798,8 @@ package android.view {













  public abstract class ActionProvider {















    ctor public ActionProvider(android.content.Context);















    method public boolean hasSubMenu();













    method public abstract android.view.View onCreateActionView();













    method public abstract deprecated android.view.View onCreateActionView();













    method public android.view.View onCreateActionView(android.view.MenuItem);















    method public boolean onPerformDefaultAction();















    method public void onPrepareSubMenu(android.view.SubMenu);















  }

























api/current.txt



+17
−17




























Original line number
Diff line number
Diff line








@@ -98,7 +98,6 @@ package android {













    field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO";















    field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";















    field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";













    field public static final java.lang.String ROUTE_MEDIA_OUTPUT = "android.permission.ROUTE_MEDIA_OUTPUT";















    field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";















    field public static final java.lang.String SET_ACTIVITY_WATCHER = "android.permission.SET_ACTIVITY_WATCHER";















    field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";










@@ -11521,24 +11520,23 @@ package android.media {













    method public void removeCallback(android.media.MediaRouter.Callback);















    method public void removeUserRoute(android.media.MediaRouter.UserRouteInfo);















    method public void selectRoute(int, android.media.MediaRouter.RouteInfo);













    method public void setSelectedRouteVolume(int, float);















    field public static final int ROUTE_TYPE_LIVE_AUDIO = 1; // 0x1















    field public static final int ROUTE_TYPE_USER = 8388608; // 0x800000















  }





























  public static abstract interface MediaRouter.Callback {













    method public abstract void onRouteAdded(int, android.media.MediaRouter.RouteInfo);













    method public abstract void onRouteChanged(android.media.MediaRouter.RouteInfo);













    method public abstract void onRouteRemoved(int, android.media.MediaRouter.RouteInfo);













    method public abstract void onRouteSelected(int, android.media.MediaRouter.RouteInfo);













    method public abstract void onRouteUnselected(int, android.media.MediaRouter.RouteInfo);













    method public abstract void onVolumeChanged(int, float);













    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);













    method public abstract void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);













    method public abstract void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);













    method public abstract void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup);













    method public abstract void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);















  }





























  public class MediaRouter.RouteCategory {















    method public java.lang.CharSequence getName();













    method public android.media.MediaRouter.RouteInfo getRouteAt(int);













    method public int getRouteCount();













    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();















  }









@@ -11546,6 +11544,8 @@ package android.media {













  public class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo {















    method public void addRoute(android.media.MediaRouter.RouteInfo);















    method public void addRoute(android.media.MediaRouter.RouteInfo, int);













    method public android.media.MediaRouter.RouteInfo getRouteAt(int);













    method public int getRouteCount();















    method public void removeRoute(android.media.MediaRouter.RouteInfo);















    method public void removeRoute(int);















  }









@@ -11556,17 +11556,17 @@ package android.media {













    method public java.lang.CharSequence getName();















    method public java.lang.CharSequence getStatus();















    method public int getSupportedTypes();













    method public float getVolume();















  }





























  public static class MediaRouter.SimpleCallback implements android.media.MediaRouter.Callback {















    ctor public MediaRouter.SimpleCallback();













    method public void onRouteAdded(int, android.media.MediaRouter.RouteInfo);













    method public void onRouteChanged(android.media.MediaRouter.RouteInfo);













    method public void onRouteRemoved(int, android.media.MediaRouter.RouteInfo);













    method public void onRouteSelected(int, android.media.MediaRouter.RouteInfo);













    method public void onRouteUnselected(int, android.media.MediaRouter.RouteInfo);













    method public void onVolumeChanged(int, float);













    method public void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);













    method public void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);













    method public void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int);













    method public void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo);













    method public void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);













    method public void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup);













    method public void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);















  }





























  public class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {

























core/java/android/app/MediaRouteActionProvider.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -87,12 +87,12 @@ public class MediaRouteActionProvider extends ActionProvider {





























    private class RouterCallback extends MediaRouter.SimpleCallback {















        @Override













        public void onRouteAdded(int type, RouteInfo info) {













        public void onRouteAdded(MediaRouter router, RouteInfo info) {















            mMenuItem.setVisible(mRouter.getRouteCount() > 1);















        }































        @Override













        public void onRouteRemoved(int type, RouteInfo info) {













        public void onRouteRemoved(MediaRouter router, RouteInfo info) {















            mMenuItem.setVisible(mRouter.getRouteCount() > 1);















        }















    }

































core/java/android/app/MediaRouteButton.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -262,22 +262,22 @@ public class MediaRouteButton extends View {





























    private class MediaRouteCallback extends MediaRouter.SimpleCallback {















        @Override













        public void onRouteSelected(int type, RouteInfo info) {













        public void onRouteSelected(MediaRouter router, int type, RouteInfo info) {















            updateRemoteIndicator();















        }































        @Override













        public void onRouteUnselected(int type, RouteInfo info) {













        public void onRouteUnselected(MediaRouter router, int type, RouteInfo info) {















            updateRemoteIndicator();















        }































        @Override













        public void onRouteAdded(int type, RouteInfo info) {













        public void onRouteAdded(MediaRouter router, RouteInfo info) {















            updateRouteCount();















        }































        @Override













        public void onRouteRemoved(int type, RouteInfo info) {













        public void onRouteRemoved(MediaRouter router, RouteInfo info) {















            updateRouteCount();















        }















    }

































core/res/AndroidManifest.xml



+0
−6




























Original line number
Diff line number
Diff line








@@ -636,12 +636,6 @@













        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"















        android:protectionLevel="signature" />





























    <!-- Allows an application to route media output to other devices. -->













    <permission android:name="android.permission.ROUTE_MEDIA_OUTPUT"













                android:permissionGroup="android.permission-group.SYSTEM_TOOLS"













                android:label="@string/permlab_route_media_output"













                android:description="@string/permdesc_route_media_output" />





























    <!-- =========================================== -->















    <!-- Permissions associated with telephony state -->















    <!-- =========================================== -->