Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab4835ee authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

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

Merge commit '00b17659' into eclair-plus-aosp

* commit '00b17659':
  Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
parents 6f4a52a3 00b17659

core/java/android/view/animation/Animation.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {