diff options
| author | Eric Arseneau <earseneau@google.com> | 2021-12-19 22:49:43 -0800 |
|---|---|---|
| committer | Eric Arseneau <earseneau@google.com> | 2021-12-22 12:52:50 -0800 |
| commit | 3e8cb98421761bb7dfafe59a22a15fe2e176f272 (patch) | |
| tree | 754d2b985bde4574c8789e254b120866cf23002a /packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java | |
| parent | 48cbb14e1815430efd7ff5086e7a4c70e75d475f (diff) | |
| parent | 6c2cb6876a30dee0b94d946ca529e06cd96b9642 (diff) | |
Merge s-mpr-2021-12-05
Change-Id: Ic2889f5eb531008340529eadc36ec8efc62b1984
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java index 28a54d56b071..e115c342c4fe 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java @@ -132,8 +132,7 @@ public class KeyguardVisibilityHelper { .alpha(1f) .withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable) .start(); - } else if (mUnlockedScreenOffAnimationController - .isScreenOffLightRevealAnimationPlaying()) { + } else if (mUnlockedScreenOffAnimationController.shouldAnimateInKeyguard()) { mKeyguardViewVisibilityAnimating = true; // Ask the screen off animation controller to animate the keyguard visibility for us |