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

Commit 102a6bff authored by Alan Viverette's avatar Alan Viverette
Browse files

Propagate original Resources to DrawableContainer if no override set 

Also fixes a double-add in ASLD.

Bug: 19498949
Change-Id: I9e7e0a0fb22a23518c80c1b099f8da0e0c1f53d8
parent 40d13f26

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;