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

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

Merge "Don't double-set keyframe values when Property exists"

parents 12705131 406a02b5

core/java/android/animation/PropertyValuesHolder.java

+14 −13
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ public class PropertyValuesHolder implements Cloneable { 
        if (mProperty != null) {

            Object value = convertBack(mProperty.get(target));

            kf.setValue(value);

        }

        } else {

            try {

                if (mGetter == null) {

                    Class targetClass = target.getClass();
@@ -879,6 +879,7 @@ public class PropertyValuesHolder implements Cloneable { 
                Log.e("PropertyValuesHolder", e.toString());

            }

        }

    }



    /**

     * This function is called by ObjectAnimator when setting the start values for an animation.