From 77198561dc47a9157c4af4dbe4a477a24ff0a3a1 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 31 Mar 2020 14:16:16 -0700 Subject: [PATCH] Reset blur radius after dialog is gone Test: press power to show dialog, turn screen off and on Fixes: 152805231 Change-Id: I6620d69c78d7b9028c0170f57569dd5ccec11a5e --- .../com/android/systemui/globalactions/GlobalActionsDialog.java | 1 + .../systemui/statusbar/NotificationShadeDepthController.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 6514ca44cf98e..6d99ef1829b21 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -1903,6 +1903,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, private void completeDismiss() { mNotificationShadeWindowController.setForceHasTopUi(mHadTopUi); + mDepthController.updateGlobalDialogVisibility(0, null /* view */); super.dismiss(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt index a3faa80485d0d..d18a41b3f482f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShadeDepthController.kt @@ -180,7 +180,7 @@ class NotificationShadeDepthController @Inject constructor( choreographer.postFrameCallback(updateBlurCallback) } - fun updateGlobalDialogVisibility(visibility: Float, dialogView: View) { + fun updateGlobalDialogVisibility(visibility: Float, dialogView: View?) { globalActionsSpring.animateTo(blurUtils.blurRadiusOfRatio(visibility), dialogView) }