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

Commit 67e9e9df authored by Romain Guy's avatar Romain Guy Committed by Jim Miller
Browse files

Manual merge of 40170 (b4a107d8) DO NOT MERGE 

Fix the lock screen.
parent 8368ef0b

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -8192,7 +8192,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
@@ -277,6 +277,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.

     *