From f643fb02509302cf882d284cb7c7c8ea167f8c45 Mon Sep 17 00:00:00 2001 From: George Mount Date: Thu, 31 Mar 2016 15:45:35 +0000 Subject: Revert "Revert "Run cleanup before end actions of ViewPropertyAnimator."" This reverts commit 879a626f18bded7b7587f1cef5bd6a491113d413. Change-Id: I6fd011fb86a2aa0e30ba41fdefa3e29c7771e647 --- core/java/android/view/ViewPropertyAnimator.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/java/android/view/ViewPropertyAnimator.java b/core/java/android/view/ViewPropertyAnimator.java index f18b7acf64f0..c604234fa577 100644 --- a/core/java/android/view/ViewPropertyAnimator.java +++ b/core/java/android/view/ViewPropertyAnimator.java @@ -1110,6 +1110,13 @@ public class ViewPropertyAnimator { @Override public void onAnimationEnd(Animator animation) { mView.setHasTransientState(false); + if (mAnimatorCleanupMap != null) { + Runnable r = mAnimatorCleanupMap.get(animation); + if (r != null) { + r.run(); + } + mAnimatorCleanupMap.remove(animation); + } if (mListener != null) { mListener.onAnimationEnd(animation); } @@ -1120,13 +1127,6 @@ public class ViewPropertyAnimator { } mAnimatorOnEndMap.remove(animation); } - if (mAnimatorCleanupMap != null) { - Runnable r = mAnimatorCleanupMap.get(animation); - if (r != null) { - r.run(); - } - mAnimatorCleanupMap.remove(animation); - } mAnimatorMap.remove(animation); } -- cgit v1.2.3-59-g8ed1b