diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java | 3 |
1 files changed, 2 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 6f78604e996f..d2e36b88fd9d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -733,7 +733,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump if (mPanelExpansionFraction != panelExpansionFraction) { if (panelExpansionFraction != 0f - && mKeyguardUnlockAnimationController.isPlayingCannedUnlockAnimation()) { + && mKeyguardUnlockAnimationController.isPlayingCannedUnlockAnimation() + && mState != ScrimState.UNLOCKED) { mAnimatingPanelExpansionOnUnlock = true; } else if (panelExpansionFraction == 0f) { mAnimatingPanelExpansionOnUnlock = false; |