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

Commit 855e63e9 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 29345d8d: am 9f64867d: Merge "Fix theme propagation to contained... 

am 29345d8d: am 9f64867d: Merge "Fix theme propagation to contained android:drawable elements" into lmp-dev

* commit '29345d8d':
  Fix theme propagation to contained android:drawable elements
parents 7363517f 29345d8d

graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -257,7 +257,7 @@ public class AnimatedRotateDrawable extends Drawable implements Drawable.Callbac 
    public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)

    public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)

            throws XmlPullParserException, IOException {

            throws XmlPullParserException, IOException {





        final TypedArray a = r.obtainAttributes(attrs, R.styleable.AnimatedRotateDrawable);

        final TypedArray a = obtainAttributes(r, theme, attrs, R.styleable.AnimatedRotateDrawable);





        super.inflateWithAttributes(r, parser, a, R.styleable.AnimatedRotateDrawable_visible);

        super.inflateWithAttributes(r, parser, a, R.styleable.AnimatedRotateDrawable_visible);

graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -357,7 +357,8 @@ public class AnimatedStateListDrawable extends StateListDrawable { 
    public void inflate(@NonNull Resources r, @NonNull XmlPullParser parser,

    public void inflate(@NonNull Resources r, @NonNull XmlPullParser parser,

            @NonNull AttributeSet attrs, @Nullable Theme theme)

            @NonNull AttributeSet attrs, @Nullable Theme theme)

            throws XmlPullParserException, IOException {

            throws XmlPullParserException, IOException {

        final TypedArray a = r.obtainAttributes(attrs, R.styleable.AnimatedStateListDrawable);

        final TypedArray a = obtainAttributes(

                r, theme, attrs, R.styleable.AnimatedStateListDrawable);





        super.inflateWithAttributes(r, parser, a, R.styleable.AnimatedStateListDrawable_visible);

        super.inflateWithAttributes(r, parser, a, R.styleable.AnimatedStateListDrawable_visible);

graphics/java/android/graphics/drawable/AnimationDrawable.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -272,7 +272,7 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An 
    public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)

    public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)

            throws XmlPullParserException, IOException {

            throws XmlPullParserException, IOException {





        TypedArray a = r.obtainAttributes(attrs,

        TypedArray a = obtainAttributes(r, theme, attrs,

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

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





        super.inflateWithAttributes(r, parser, a,

        super.inflateWithAttributes(r, parser, a,
@@ -300,7 +300,8 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An 
                continue;

                continue;

            }

            }





            a = r.obtainAttributes(attrs, com.android.internal.R.styleable.AnimationDrawableItem);

            a = obtainAttributes(

                    r, theme, attrs, com.android.internal.R.styleable.AnimationDrawableItem);

            int duration = a.getInt(

            int duration = a.getInt(

                    com.android.internal.R.styleable.AnimationDrawableItem_duration, -1);

                    com.android.internal.R.styleable.AnimationDrawableItem_duration, -1);

            if (duration < 0) {

            if (duration < 0) {

graphics/java/android/graphics/drawable/ClipDrawable.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,8 @@ public class ClipDrawable extends Drawable implements Drawable.Callback { 




        int type;

        int type;





        TypedArray a = r.obtainAttributes(attrs, com.android.internal.R.styleable.ClipDrawable);

        TypedArray a = obtainAttributes(

                r, theme, attrs, com.android.internal.R.styleable.ClipDrawable);





        int orientation = a.getInt(

        int orientation = a.getInt(

                com.android.internal.R.styleable.ClipDrawable_clipOrientation,

                com.android.internal.R.styleable.ClipDrawable_clipOrientation,

graphics/java/android/graphics/drawable/InsetDrawable.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ public class InsetDrawable extends Drawable implements Drawable.Callback { 
    @Override

    @Override

    public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)

    public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)

            throws XmlPullParserException, IOException {

            throws XmlPullParserException, IOException {

        final TypedArray a = r.obtainAttributes(attrs, R.styleable.InsetDrawable);

        final TypedArray a = obtainAttributes(r, theme, attrs, R.styleable.InsetDrawable);

        super.inflateWithAttributes(r, parser, a, R.styleable.InsetDrawable_visible);

        super.inflateWithAttributes(r, parser, a, R.styleable.InsetDrawable_visible);





        mInsetState.mDrawable = null;

        mInsetState.mDrawable = null;