diff options
| author | Romain Guy <romainguy@android.com> | 2010-02-17 21:22:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-17 21:22:52 -0800 |
| commit | ab4835ee0df866a4f7982644742e2b758c50fdd7 (patch) | |
| tree | b9adce5258ebf6e6f5eebeaaaa8d13e8591e0fae /core/java/android | |
| parent | 6f4a52a3f7c6bd87e7109d741441bff332a445a4 (diff) | |
| parent | 00b17659bb4b2774580eea523c5f23b588105ab6 (diff) | |
am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Merge commit '00b17659bb4b2774580eea523c5f23b588105ab6' into eclair-plus-aosp
* commit '00b17659bb4b2774580eea523c5f23b588105ab6':
Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/animation/Animation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java index 4af1c8905a3d..11727b1002ed 100644 --- a/core/java/android/view/animation/Animation.java +++ b/core/java/android/view/animation/Animation.java @@ -282,8 +282,8 @@ public abstract class Animation implements Cloneable { */ public void detach() { if (mStarted && !mEnded) { - if (mListener != null) mListener.onAnimationEnd(this); mEnded = true; + if (mListener != null) mListener.onAnimationEnd(this); } } @@ -777,10 +777,10 @@ public abstract class Animation implements Cloneable { if (expired) { if (mRepeatCount == mRepeated) { if (!mEnded) { + mEnded = true; if (mListener != null) { mListener.onAnimationEnd(this); } - mEnded = true; } } else { if (mRepeatCount > 0) { |