From b0b7a04d2a9da9774855e6583cc0ca42c8e7bf09 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Wed, 15 Apr 2020 12:23:26 -0700
Subject: 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
---
 .../com/android/systemui/statusbar/NotificationShadeDepthController.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)
-- 
cgit v1.2.3-59-g8ed1b