diff options
| author | 2020-04-15 20:57:30 +0000 | |
|---|---|---|
| committer | 2020-04-15 20:57:30 +0000 | |
| commit | 60be958cfc262cebe2c26c39585ca2955a0a3503 (patch) | |
| tree | 1af9977afa952d912e342d9c7071bb79dd7653d2 | |
| parent | 1643bc399538103c7663d5dc357c7c12ffa2f205 (diff) | |
| parent | b0b7a04d2a9da9774855e6583cc0ca42c8e7bf09 (diff) | |
Merge "Do not blur shade while fading away" into rvc-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt | 3 |
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) |