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

Commit 778b7d67 authored by Lais Andrade's avatar Lais Andrade Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 5db2bcff am: f8712712 am: 4614b731

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

Change-Id: I7a450caded1b1b588734d26709d603480c999cd8
parents d2ce0e0f 4614b731

core/java/android/animation/AnimatorSet.java

+10 −10
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 


    // This is to work around a bug in b/34736819. This needs to be removed once app team

    // fixes their side.

    private AnimatorListenerAdapter mDummyListener = new AnimatorListenerAdapter() {

    private AnimatorListenerAdapter mAnimationEndingListener = new AnimatorListenerAdapter() {

        @Override

        public void onAnimationEnd(Animator animation) {

            if (mNodeMap.get(animation) == null) {
@@ -1186,7 +1186,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 
    }



    private void startAnimation() {

        addDummyListener();

        addAnimationEndingListener();



        // Register animation callback

        addAnimationCallback(0);
@@ -1243,15 +1243,15 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 


    // This is to work around the issue in b/34736819, as the old behavior in AnimatorSet had

    // masked a real bug in play movies. TODO: remove this and below once the root cause is fixed.

    private void addDummyListener() {

    private void addAnimationEndingListener() {

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

            mNodes.get(i).mAnimation.addListener(mDummyListener);

            mNodes.get(i).mAnimation.addListener(mAnimationEndingListener);

        }

    }



    private void removeDummyListener() {

    private void removeAnimationEndingListener() {

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

            mNodes.get(i).mAnimation.removeListener(mDummyListener);

            mNodes.get(i).mAnimation.removeListener(mAnimationEndingListener);

        }

    }
@@ -1301,7 +1301,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 
                tmpListeners.get(i).onAnimationEnd(this, mReversing);

            }

        }

        removeDummyListener();

        removeAnimationEndingListener();

        mSelfPulse = true;

        mReversing = false;

    }
@@ -1346,7 +1346,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 
        anim.mNodeMap = new ArrayMap<Animator, Node>();

        anim.mNodes = new ArrayList<Node>(nodeCount);

        anim.mEvents = new ArrayList<AnimationEvent>();

        anim.mDummyListener = new AnimatorListenerAdapter() {

        anim.mAnimationEndingListener = new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {

                if (anim.mNodeMap.get(animation) == null) {
@@ -1369,7 +1369,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 
            final Node node = mNodes.get(n);

            Node nodeClone = node.clone();

            // Remove the old internal listener from the cloned child

            nodeClone.mAnimation.removeListener(mDummyListener);

            nodeClone.mAnimation.removeListener(mAnimationEndingListener);

            clonesMap.put(node, nodeClone);

            anim.mNodes.add(nodeClone);

            anim.mNodeMap.put(nodeClone.mAnimation, nodeClone);
@@ -2087,7 +2087,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 
         * animation starts.

         */

        public Builder after(long delay) {

            // setup dummy ValueAnimator just to run the clock

            // setup a ValueAnimator just to run the clock

            ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);

            anim.setDuration(delay);

            after(anim);