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

Commit 1350be3c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use Animator cancel instead of end" into ub-launcher3-qt-dev

parents f66f6aef 4ff2a278

go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java

+3 −1
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ public final class ContentFillItemAnimator extends SimpleItemAnimator { 


                    @Override

                    public void onAnimationEnd(Animator animation) {

                        CONTENT_TRANSITION_PROGRESS.set(itemView, 1.0f);

                        dispatchChangeFinished(viewHolder, true /* oldItem */);

                        mRunningAnims.remove(anim);

                        dispatchFinishedWhenDone();
@@ -252,7 +253,8 @@ public final class ContentFillItemAnimator extends SimpleItemAnimator { 
        }

        for (int i = mRunningAnims.size() - 1; i >= 0; i--) {

            ObjectAnimator anim = mRunningAnims.get(i);

            anim.end();

            // This calls the on end animation callback which will set values to their end target.

            anim.cancel();

        }

        dispatchAnimationsFinished();

    }