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

Commit b76bcc07 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Fix bug with values in cloned animators."

parents 1254e7a3 d4dd7025

core/java/android/animation/ValueAnimator.java

+3 −5
Original line number Diff line number Diff line
@@ -1173,13 +1173,11 @@ public class ValueAnimator extends Animator { 
        if (oldValues != null) {

            int numValues = oldValues.length;

            anim.mValues = new PropertyValuesHolder[numValues];

            for (int i = 0; i < numValues; ++i) {

                anim.mValues[i] = oldValues[i].clone();

            }

            anim.mValuesMap = new HashMap<String, PropertyValuesHolder>(numValues);

            for (int i = 0; i < numValues; ++i) {

                PropertyValuesHolder valuesHolder = mValues[i];

                anim.mValuesMap.put(valuesHolder.getPropertyName(), valuesHolder);

                PropertyValuesHolder newValuesHolder = oldValues[i].clone();

                anim.mValues[i] = newValuesHolder;

                anim.mValuesMap.put(newValuesHolder.getPropertyName(), newValuesHolder);

            }

        }

        return anim;