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

Commit 8c583083 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Fix the lock screen."

parents f3449ee8 b4a107d8

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -8282,7 +8282,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     */

    public void clearAnimation() {

        if (mCurrentAnimation != null) {

            mCurrentAnimation.cancel();

            mCurrentAnimation.detach();

        }

        mCurrentAnimation = null;

    }

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

+10 −0
Original line number Diff line number Diff line
@@ -276,6 +276,16 @@ public abstract class Animation implements Cloneable { 
        mMore = mOneMoreTime = false;

    }



    /**

     * @hide

     */

    public void detach() {

        if (mStarted && !mEnded) {

            if (mListener != null) mListener.onAnimationEnd(this);

            mEnded = true;

        }

    }



    /**

     * Whether or not the animation has been initialized.

     *