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

Commit da828803 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 2dde147b: Merge "Add an XML attribute for controlling which route types a... 

am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev

* commit '2dde147b':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
parents b56fe8ab 2dde147b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ package android { 
    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 mediaRouteTypes = 16843694; // 0x10103ae

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

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

    field public static final int minDate = 16843583; // 0x101033f

core/java/android/app/MediaRouteButton.java

+5 −0
Original line number Diff line number Diff line
@@ -73,9 +73,14 @@ public class MediaRouteButton extends View { 
                com.android.internal.R.styleable.MediaRouteButton_minWidth, 0);

        mMinHeight = a.getDimensionPixelSize(

                com.android.internal.R.styleable.MediaRouteButton_minHeight, 0);

        final int routeTypes = a.getInteger(

                com.android.internal.R.styleable.MediaRouteButton_mediaRouteTypes,

                MediaRouter.ROUTE_TYPE_LIVE_AUDIO);

        a.recycle();



        setClickable(true);



        setRouteTypes(routeTypes);

    }



    private void setRemoteIndicatorDrawable(Drawable d) {

core/res/res/values/attrs.xml

+9 −0
Original line number Diff line number Diff line
@@ -5703,6 +5703,15 @@ 
             @hide -->

        <attr name="externalRouteEnabledDrawable" format="reference" />



        <!-- The types of media routes the button and its resulting

             chooser will filter by. -->

        <attr name="mediaRouteTypes" format="integer">

            <!-- Allow selection of live audio routes. -->

            <enum name="liveAudio" value="0x1" />

            <!-- Allow selection of user (app-specified) routes. -->

            <enum name="user" value="0x800000" />

        </attr>



        <attr name="minWidth" />

        <attr name="minHeight" />

    </declare-styleable>

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -3644,6 +3644,7 @@ 
  <public type="attr" name="fontFamily" id="0x010103ac" />



  <public type="attr" name="mediaRouteButtonStyle" id="0x010103ad" />

  <public type="attr" name="mediaRouteTypes" id="0x010103ae" />

  <public type="style" name="Widget.Holo.MediaRouteButton" id="0x010301d5" />

  <public type="style" name="Widget.Holo.Light.MediaRouteButton" id="0x010301d6" />

  <public type="style" name="Widget.DeviceDefault.MediaRouteButton" id="0x010301d7" />