From 2ad14d184e622057925605d38ec4542468717698 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Tue, 8 Mar 2022 14:08:08 -0500 Subject: [PATCH] Ensure blur radius goes to 0 If the animation is canceled, it may not end the blur radius at 0, which affects NotificationShadeWindowControllerImpl for wake and unlock scenarios. When this is not 0, SysUI then believes it should still be visible and retain focus, which absorbs all touches that should be going to launcher. It was also noticed that some users has reported a blurry background. Bug: 220703613 Test: manual (wake and unlock over and over again) Change-Id: Ief7ba5eabbcbbe08e2f2dec3072420aa5539fa8f --- .../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 267ee6d2d177d..a0388de5150cf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt @@ -259,6 +259,7 @@ class NotificationShadeDepthController @Inject constructor( addListener(object : AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator?) { keyguardAnimator = null + wakeAndUnlockBlurRadius = 0f scheduleUpdate() } }) @@ -439,7 +440,7 @@ class NotificationShadeDepthController @Inject constructor( it.println("StatusBarWindowBlurController:") it.increaseIndent() it.println("shadeExpansion: $shadeExpansion") - it.println("shouldApplyShaeBlur: ${shouldApplyShadeBlur()}") + it.println("shouldApplyShadeBlur: ${shouldApplyShadeBlur()}") it.println("shadeAnimation: ${shadeAnimation.radius}") it.println("brightnessMirrorRadius: ${brightnessMirrorSpring.radius}") it.println("wakeAndUnlockBlur: $wakeAndUnlockBlurRadius")