Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Run cleanup before end actions of ViewPropertyAnimator."" into nyc-dev

Browse Source
This commit is contained in:
George Mount
2016-03-30 22:55:28 +00:00
committed by Android (Google) Code Review
parent 02add6aa91 879a626f18
commit 6bb61e25a2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/view/ViewPropertyAnimator.java
View File

@@ -1113,13 +1113,6 @@ public class ViewPropertyAnimator {
if (mListener != null) {
mListener.onAnimationEnd(animation);
}
if (mAnimatorCleanupMap != null) {
Runnable r = mAnimatorCleanupMap.get(animation);
if (r != null) {
r.run();
}
mAnimatorCleanupMap.remove(animation);
}
if (mAnimatorOnEndMap != null) {
Runnable r = mAnimatorOnEndMap.get(animation);
if (r != null) {
@@ -1127,6 +1120,13 @@ 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);
}