summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2020-04-15 12:23:26 -0700
committer Lucas Dupin <dupin@google.com> 2020-04-15 12:30:15 -0700
commitb0b7a04d2a9da9774855e6583cc0ca42c8e7bf09 (patch)
tree100c829990fb01fcf217deae7effd5ef1729762d
parentadf530fc264267260aae06231e4be59c74f30a36 (diff)
Do not blur shade while fading away
The shade will become expanded during face-auth when the keyguard is going away. We need to ignore event until the keyguard is gone. Test: unlock with face auth, from lock screen Fixes: 153559173 Change-Id: If0db37bf22bef22ea3feab52ead6c6020a5a89dc
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt
index 0d7715958995..25f1a974bc36 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt
@@ -250,7 +250,8 @@ class NotificationShadeDepthController @Inject constructor(
private fun updateShadeBlur() {
var newBlur = 0
val state = statusBarStateController.state
- if (state == StatusBarState.SHADE || state == StatusBarState.SHADE_LOCKED) {
+ if ((state == StatusBarState.SHADE || state == StatusBarState.SHADE_LOCKED) &&
+ !keyguardStateController.isKeyguardFadingAway) {
newBlur = blurUtils.blurRadiusOfRatio(shadeExpansion)
}
shadeSpring.animateTo(newBlur)