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

Commit 8ff4c040 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed an issue where the scrim could be lost" into nyc-dev 

am: 05d61ede

* commit '05d61ede':
  Fixed an issue where the scrim could be lost

Change-Id: I1fdb9d9636c477f24c934cdee618eab95fd3c574
parents cf851a98 05d61ede

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

+6 −5
Original line number Diff line number Diff line
@@ -344,8 +344,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
                if (mOnAnimationFinished != null) {

                    mOnAnimationFinished.run();

                    mOnAnimationFinished = null;

                    mKeyguardFadingOutInProgress = false;

                }

                mKeyguardFadingOutInProgress = false;

                scrim.setTag(TAG_KEY_ANIM, null);

                scrim.setTag(TAG_KEY_ANIM_TARGET, null);

            }
@@ -384,10 +384,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 


    private void endAnimateKeyguardFadingOut(boolean force) {

        mAnimateKeyguardFadingOut = false;

        if ((force || (!isAnimating(mScrimInFront) && !isAnimating(mScrimBehind)))

                && mOnAnimationFinished != null) {

        if (force || (!isAnimating(mScrimInFront) && !isAnimating(mScrimBehind))) {

            if (mOnAnimationFinished != null) {

                mOnAnimationFinished.run();

                mOnAnimationFinished = null;

            }

            mKeyguardFadingOutInProgress = false;

        }

    }