diff options
author | Adam Powell <adamp@google.com> | 2012-06-04 19:22:45 -0700 |
---|---|---|
committer | Adam Powell <adamp@google.com> | 2012-06-05 19:15:57 -0700 |
commit | 690ffb4e1f735148a15f2036d9a3c1962fba188c (patch) | |
tree | aa5179aa9beedd2ef71dc1d97c9353b16a1de043 /api | |
parent | 3676b137ecf2f24e88e8a3567c11234e7d4416d2 (diff) | |
download | frameworks_base-690ffb4e1f735148a15f2036d9a3c1962fba188c.zip frameworks_base-690ffb4e1f735148a15f2036d9a3c1962fba188c.tar.gz frameworks_base-690ffb4e1f735148a15f2036d9a3c1962fba188c.tar.bz2 |
More fun with MediaRouter
Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.
Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.
Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 9540eab..a416e30 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); @@ -11489,6 +11508,7 @@ package android.media { 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); @@ -11496,10 +11516,11 @@ package android.media { 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); - method public void setRouteVolume(int, float); + 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 } @@ -11534,6 +11555,7 @@ 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 { @@ -22775,7 +22797,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); } |