diff options
| author | Justin Koh <justinkoh@google.com> | 2015-04-22 00:53:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-22 00:53:38 +0000 |
| commit | 593389501fb3f291eb4b1de4b995318c1ac458b0 (patch) | |
| tree | b12881b97f4f03af3f78e27ebb1c10af493eee94 | |
| parent | 2947926ce8f15417cebaad936482fc7c18957eaa (diff) | |
| parent | ba75135a807c87f4d6c14e69b1246eabd39f4117 (diff) | |
| download | frameworks_base-593389501fb3f291eb4b1de4b995318c1ac458b0.zip frameworks_base-593389501fb3f291eb4b1de4b995318c1ac458b0.tar.gz frameworks_base-593389501fb3f291eb4b1de4b995318c1ac458b0.tar.bz2 | |
am ba75135a: am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
* commit 'ba75135a807c87f4d6c14e69b1246eabd39f4117':
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
| -rw-r--r-- | core/java/android/animation/ValueAnimator.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index 9709555..2be3e23 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -1389,6 +1389,12 @@ public class ValueAnimator extends Animator { anim.mInitialized = false; anim.mPlayingState = STOPPED; anim.mStartedDelay = false; + anim.mStarted = false; + anim.mRunning = false; + anim.mPaused = false; + anim.mResumed = false; + anim.mStartListenersCalled = false; + PropertyValuesHolder[] oldValues = mValues; if (oldValues != null) { int numValues = oldValues.length; |