diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index dfc816ca15ce..eae0b8e47614 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -91,6 +91,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, private boolean mSkipFirstFrame; private boolean mDontAnimateBouncerChanges; private boolean mKeyguardFadingOutInProgress; + private ValueAnimator mKeyguardFadeoutAnimation; public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim) { mScrimBehind = scrimBehind; @@ -135,6 +136,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, if (mPinnedHeadsUpCount != 0) { updateHeadsUpScrim(false); } + if (mKeyguardFadeoutAnimation != null) { + mKeyguardFadeoutAnimation.cancel(); + } } } @@ -345,7 +349,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, mOnAnimationFinished.run(); mOnAnimationFinished = null; } - mKeyguardFadingOutInProgress = false; + if (mKeyguardFadingOutInProgress) { + mKeyguardFadeoutAnimation = null; + mKeyguardFadingOutInProgress = false; + } scrim.setTag(TAG_KEY_ANIM, null); scrim.setTag(TAG_KEY_ANIM_TARGET, null); } @@ -353,6 +360,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, anim.start(); if (mAnimateKeyguardFadingOut) { mKeyguardFadingOutInProgress = true; + mKeyguardFadeoutAnimation = anim; } if (mSkipFirstFrame) { anim.setCurrentPlayTime(16); |