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

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

Merge "Propagate original Resources to DrawableContainer if no override set"

parents 14a92fe7 102a6bff

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

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ public class AnimatedStateListDrawable extends StateListDrawable { 
                mTransitions.append(keyToFrom, pos | REVERSED_BIT | reversibleBit);

            }



            return addChild(anim);

            return pos;

        }



        int addStateSet(@NonNull int[] stateSet, @NonNull Drawable drawable, int id) {

graphics/java/android/graphics/drawable/DrawableContainer.java

+1 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { 
        DrawableContainerState(DrawableContainerState orig, DrawableContainer owner,

                Resources res) {

            mOwner = owner;

            mRes = res;

            mRes = res != null ? res : orig != null ? orig.mRes : null;



            if (orig != null) {

                mChangingConfigurations = orig.mChangingConfigurations;