From 6a3ad1a18c873b1893d88a98f9a3ba9ff5cdc40d Mon Sep 17 00:00:00 2001 From: Justin Weir Date: Thu, 6 Mar 2025 16:28:30 -0500 Subject: 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 --- .../systemui/shade/NotificationShadeWindowControllerImpl.java | 5 +++-- 1 file 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; } -- cgit v1.2.3-59-g8ed1b