Merge "Do not blur shade while fading away" into rvc-dev am: 60be958cfc

Change-Id: I66057d66fc809c9c115c59bd6b3e714e802a4d59
2020-04-15 21:02:42 +00:00
parent 95a30cd5d3 60be958cfc
commit 0e5592f6ec
1 changed files with 2 additions and 1 deletions
--- 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)