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

am aa627037: am c838b677: Merge "Cancel animation when target changes." into lmp-mr1-dev

Browse Source 
* commit 'aa6270375263ebf6da4f2f0de31df808eb278563':
  Cancel animation when target changes.
This commit is contained in:
George Mount
2014-11-05 23:15:00 +00:00
committed by Android Git Automerger
parent fce461eada aa62703752
commit a3fdc18fd7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/animation/ObjectAnimator.java
View File

@@ -885,7 +885,8 @@ public final class ObjectAnimator extends ValueAnimator {
} }
/** /**
* Sets the target object whose property will be animated by this animation * Sets the target object whose property will be animated by this animation. If the
* animator has been started, it will be canceled.
* *
* @param target The object being animated * @param target The object being animated
*/ */
@@ -893,6 +894,9 @@ public final class ObjectAnimator extends ValueAnimator {
public void setTarget(@Nullable Object target) { public void setTarget(@Nullable Object target) {
final Object oldTarget = getTarget(); final Object oldTarget = getTarget();
if (oldTarget != target) { if (oldTarget != target) {
if (isStarted()) {
cancel();
}
mTarget = target == null ? null : new WeakReference<Object>(target); mTarget = target == null ? null : new WeakReference<Object>(target);
// New target should cause re-initialization prior to starting // New target should cause re-initialization prior to starting
mInitialized = false; mInitialized = false;