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

Commit 2857fdab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Start saving attribute data for ViewAnimator."

parents 2c019628 fae34458

core/java/android/widget/ViewAnimator.java

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ public class ViewAnimator extends FrameLayout { 
        super(context, attrs);



        TypedArray a = context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.ViewAnimator);

        saveAttributeDataForStyleable(context, com.android.internal.R.styleable.ViewAnimator,

                attrs, a, 0, 0);



        int resource = a.getResourceId(com.android.internal.R.styleable.ViewAnimator_inAnimation, 0);

        if (resource > 0) {

            setInAnimation(context, resource);
@@ -90,6 +93,8 @@ public class ViewAnimator extends FrameLayout { 
        // attribute to override.

        final TypedArray a = context.obtainStyledAttributes(attrs,

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

        saveAttributeDataForStyleable(context, com.android.internal.R.styleable.FrameLayout,

                attrs, a, 0, 0);

        final boolean measureAllChildren = a.getBoolean(

                com.android.internal.R.styleable.FrameLayout_measureAllChildren, true);

        setMeasureAllChildren(measureAllChildren);