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

Commit 8c3ecc94 authored by George Mount's avatar George Mount Committed by Automerger Merge Worker
Browse files

Don't notify updates while initializing AnimatorSet am: c720d0af 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22182983



Change-Id: Ia2e6dea4f5c75a738c0c1ca60a06daf264974798
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25515df0 c720d0af

core/java/android/animation/ValueAnimator.java

+4 −2
Original line number Diff line number Diff line
@@ -1470,7 +1470,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio 
            iteration = Math.min(iteration, mRepeatCount);

            lastIteration = Math.min(lastIteration, mRepeatCount);



            if (iteration != lastIteration) {

            if (notify && iteration != lastIteration) {

                notifyListeners(AnimatorCaller.ON_REPEAT, false);

            }

        }
@@ -1669,8 +1669,10 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio 
        for (int i = 0; i < numValues; ++i) {

            mValues[i].calculateValue(fraction);

        }

        if (mSeekFraction >= 0 || mStartListenersCalled) {

            callOnList(mUpdateListeners, AnimatorCaller.ON_UPDATE, this, false);

        }

    }



    @Override

    public ValueAnimator clone() {

core/tests/coretests/src/android/animation/AnimatorSetCallsTest.java

+55 −5
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import org.junit.Before; 
import org.junit.Rule;

import org.junit.Test;



import java.util.ArrayList;



@MediumTest

public class AnimatorSetCallsTest {

    @Rule
@@ -38,6 +40,7 @@ public class AnimatorSetCallsTest { 


    private AnimatorSetActivity mActivity;

    private AnimatorSet mSet1;

    private ObjectAnimator mAnimator;

    private CountListener mListener1;

    private CountListener mListener2;

    private CountListener mListener3;
@@ -58,13 +61,13 @@ public class AnimatorSetCallsTest { 
            set2.addListener(mListener2);

            set2.addPauseListener(mListener2);



            ObjectAnimator anim = ObjectAnimator.ofFloat(square, "translationX", 0f, 100f);

            mAnimator = ObjectAnimator.ofFloat(square, "translationX", 0f, 100f);

            mListener3 = new CountListener();

            anim.addListener(mListener3);

            anim.addPauseListener(mListener3);

            anim.setDuration(1);

            mAnimator.addListener(mListener3);

            mAnimator.addPauseListener(mListener3);

            mAnimator.setDuration(1);



            set2.play(anim);

            set2.play(mAnimator);

            mSet1.play(set2);

        });

    }
@@ -157,6 +160,53 @@ public class AnimatorSetCallsTest { 
        );

    }



    @Test

    public void updateOnlyWhileChangingValues() {

        ArrayList<Float> updateValues = new ArrayList<>();

        mAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {

            @Override

            public void onAnimationUpdate(ValueAnimator animation) {

                updateValues.add((Float) animation.getAnimatedValue());

            }

        });



        mSet1.setCurrentPlayTime(0);



        assertEquals(1, updateValues.size());

        assertEquals(0f, updateValues.get(0), 0f);

    }

    @Test

    public void updateOnlyWhileRunning() {

        ArrayList<Float> updateValues = new ArrayList<>();

        mAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {

            @Override

            public void onAnimationUpdate(ValueAnimator animation) {

                updateValues.add((Float) animation.getAnimatedValue());

            }

        });



        mRule.getScenario().onActivity((a) -> {

            mSet1.start();

        });



        waitForOnUiThread(() -> mListener1.endForward > 0);



        // the duration is only 1ms, so there should only be two values, 0 and 100.

        assertEquals(0f, updateValues.get(0), 0f);

        assertEquals(100f, updateValues.get(updateValues.size() - 1), 0f);



        // now check all the values in the middle, which can never go from 100->0.

        boolean isAtEnd = false;

        for (int i = 1; i < updateValues.size() - 1; i++) {

            float actual = updateValues.get(i);

            if (actual == 100f) {

                isAtEnd = true;

            }

            float expected = isAtEnd ? 100f : 0f;

            assertEquals(expected, actual, 0f);

        }

    }



    private void waitForOnUiThread(PollingCheck.PollingCheckCondition condition) {

        final boolean[] value = new boolean[1];

        PollingCheck.waitFor(() -> {