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

Commit 5b73e365 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Add View constructor that supplies a default style resource"

parents 20d39232 617feb99

api/current.txt

+78 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/FragmentBreadCrumbs.java

+9 −4
Original line number Diff line number Diff line
@@ -84,11 +84,16 @@ public class FragmentBreadCrumbs extends ViewGroup 
        this(context, attrs, android.R.style.Widget_FragmentBreadCrumbs);

    }



    public FragmentBreadCrumbs(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

    public FragmentBreadCrumbs(Context context, AttributeSet attrs, int defStyleAttr) {

        this(context, attrs, defStyleAttr, 0);

    }



    public FragmentBreadCrumbs(

            Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);



        TypedArray a = context.obtainStyledAttributes(attrs,

                com.android.internal.R.styleable.FragmentBreadCrumbs, defStyle, 0);

        final TypedArray a = context.obtainStyledAttributes(attrs,

                com.android.internal.R.styleable.FragmentBreadCrumbs, defStyleAttr, defStyleRes);



        mGravity = a.getInt(com.android.internal.R.styleable.FragmentBreadCrumbs_gravity,

                DEFAULT_GRAVITY);

core/java/android/app/MediaRouteButton.java

+8 −3
Original line number Diff line number Diff line
@@ -75,12 +75,17 @@ public class MediaRouteButton extends View { 
    }



    public MediaRouteButton(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        this(context, attrs, defStyleAttr, 0);

    }



    public MediaRouteButton(

            Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);



        mRouter = (MediaRouter)context.getSystemService(Context.MEDIA_ROUTER_SERVICE);



        TypedArray a = context.obtainStyledAttributes(attrs,

                com.android.internal.R.styleable.MediaRouteButton, defStyleAttr, 0);

        final TypedArray a = context.obtainStyledAttributes(attrs,

                com.android.internal.R.styleable.MediaRouteButton, defStyleAttr, defStyleRes);

        setRemoteIndicatorDrawable(a.getDrawable(

                com.android.internal.R.styleable.MediaRouteButton_externalRouteEnabledDrawable));

        mMinWidth = a.getDimensionPixelSize(

core/java/android/gesture/GestureOverlayView.java

+9 −4
Original line number Diff line number Diff line
@@ -134,11 +134,16 @@ public class GestureOverlayView extends FrameLayout { 
        this(context, attrs, com.android.internal.R.attr.gestureOverlayViewStyle);

    }



    public GestureOverlayView(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

    public GestureOverlayView(Context context, AttributeSet attrs, int defStyleAttr) {

        this(context, attrs, defStyleAttr, 0);

    }



    public GestureOverlayView(

            Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);



        TypedArray a = context.obtainStyledAttributes(attrs,

                R.styleable.GestureOverlayView, defStyle, 0);

        final TypedArray a = context.obtainStyledAttributes(

                attrs, R.styleable.GestureOverlayView, defStyleAttr, defStyleRes);



        mGestureStrokeWidth = a.getFloat(R.styleable.GestureOverlayView_gestureStrokeWidth,

                mGestureStrokeWidth);

core/java/android/inputmethodservice/ExtractButton.java

+6 −2
Original line number Diff line number Diff line
@@ -32,8 +32,12 @@ class ExtractButton extends Button { 
        super(context, attrs, com.android.internal.R.attr.buttonStyle);

    }



    public ExtractButton(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

    public ExtractButton(Context context, AttributeSet attrs, int defStyleAttr) {

        this(context, attrs, defStyleAttr, 0);

    }



    public ExtractButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

    }

    

    /**