summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Weir <justinweir@google.com> 2025-03-06 16:28:30 -0500
committer Justin Weir <justinweir@google.com> 2025-03-06 16:28:30 -0500
commit6a3ad1a18c873b1893d88a98f9a3ba9ff5cdc40d (patch)
tree3943e31aea27c6f6388717f3c9d7d094b5c7f805
parentc0669619bf00bfa41eec7a30de0f2d0dc18f27da (diff)
Disable blur forcing shade window to be visible
ag/10672056 added a check for a non-zero blur radius in the logic that determines whether the window should be visible. We believe that the check is not required for the new implementation of blur and that a race condition that only occurs on emulated devices is causing tests to flake due to non-zero blur being set on an invisible shade, which makes it become visible and steal input events. Bug: 394977231 Flag: com.android.systemui.disable_shade_visible_with_blur Test: manually checked shade CUJs Change-Id: Ie433a4378fea6ccc81f942a50b1eb71ee14cf763
-rw-r--r--packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
index fa17b4fad592..dafb1a559d59 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java
@@ -498,17 +498,18 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
}
private boolean isExpanded(NotificationShadeWindowState state) {
+ boolean visForBlur = !Flags.disableShadeVisibleWithBlur() && state.backgroundBlurRadius > 0;
boolean isExpanded = !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded()
|| state.panelVisible || state.keyguardFadingAway || state.bouncerShowing
|| state.headsUpNotificationShowing
|| state.scrimsVisibility != ScrimController.TRANSPARENT)
- || state.backgroundBlurRadius > 0
+ || visForBlur
|| state.launchingActivityFromNotification;
mLogger.logIsExpanded(isExpanded, state.forceWindowCollapsed,
state.isKeyguardShowingAndNotOccluded(), state.panelVisible,
state.keyguardFadingAway, state.bouncerShowing, state.headsUpNotificationShowing,
state.scrimsVisibility != ScrimController.TRANSPARENT,
- state.backgroundBlurRadius > 0, state.launchingActivityFromNotification);
+ visForBlur, state.launchingActivityFromNotification);
return isExpanded;
}