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

am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.

Browse Source 
Merge commit '00b17659bb4b2774580eea523c5f23b588105ab6' into eclair-plus-aosp

* commit '00b17659bb4b2774580eea523c5f23b588105ab6':
  Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
This commit is contained in:
Romain Guy
2010-02-17 21:22:52 -08:00
committed by Android Git Automerger
parent 6f4a52a3f7 00b17659bb
commit ab4835ee0d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/animation/Animation.java
View File

@@ -282,8 +282,8 @@ public abstract class Animation implements Cloneable {
*/ */
public void detach() { public void detach() {
if (mStarted && !mEnded) { if (mStarted && !mEnded) {
if (mListener != null) mListener.onAnimationEnd(this);
mEnded = true; mEnded = true;
if (mListener != null) mListener.onAnimationEnd(this);
} }
} }
@@ -777,10 +777,10 @@ public abstract class Animation implements Cloneable {
if (expired) { if (expired) {
if (mRepeatCount == mRepeated) { if (mRepeatCount == mRepeated) {
if (!mEnded) { if (!mEnded) {
mEnded = true;
if (mListener != null) { if (mListener != null) {
mListener.onAnimationEnd(this); mListener.onAnimationEnd(this);
} }
mEnded = true;
} }
} else { } else {
if (mRepeatCount > 0) { if (mRepeatCount > 0) {