diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java | 8 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt | 35 |
2 files changed, 42 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java index af74c2793cc9..46f12105e032 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java @@ -423,12 +423,18 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW } private boolean isExpanded(NotificationShadeWindowState state) { - return !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded() + boolean isExpanded = !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded() || state.panelVisible || state.keyguardFadingAway || state.bouncerShowing || state.headsUpNotificationShowing || state.scrimsVisibility != ScrimController.TRANSPARENT) || state.backgroundBlurRadius > 0 || 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); + return isExpanded; } private void applyFitsSystemWindows(NotificationShadeWindowState state) { diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt index d8d42795be58..d06634b63b6b 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeWindowLogger.kt @@ -65,6 +65,41 @@ class ShadeWindowLogger @Inject constructor(@ShadeWindowLog private val buffer: { "Updating visibility, should be visible : $bool1" }) } + fun logIsExpanded( + isExpanded: Boolean, + forceWindowCollapsed: Boolean, + isKeyguardShowingAndNotOccluded: Boolean, + panelVisible: Boolean, + keyguardFadingAway: Boolean, + bouncerShowing: Boolean, + headsUpNotificationShowing: Boolean, + scrimsVisibilityNotTransparent: Boolean, + backgroundBlurRadius: Boolean, + launchingActivityFromNotification: Boolean + ) { + buffer.log( + TAG, + DEBUG, + { + str1 = isExpanded.toString() + bool1 = forceWindowCollapsed + bool2 = isKeyguardShowingAndNotOccluded + bool3 = panelVisible + bool4 = keyguardFadingAway + int1 = if (bouncerShowing) 1 else 0 + int2 = if (headsUpNotificationShowing) 1 else 0 + long1 = if (scrimsVisibilityNotTransparent) 1 else 0 + long2 = if (backgroundBlurRadius) 1 else 0 + double1 = if (launchingActivityFromNotification) 1.0 else 0.0 + }, + { "Setting isExpanded to $str1: forceWindowCollapsed $bool1, " + + "isKeyguardShowingAndNotOccluded $bool2, panelVisible $bool3, " + + "keyguardFadingAway $bool4, bouncerShowing $int1," + + "headsUpNotificationShowing $int2, scrimsVisibilityNotTransparent $long1," + + "backgroundBlurRadius $long2, launchingActivityFromNotification $double1"} + ) + } + fun logShadeVisibleAndFocusable(visible: Boolean) { buffer.log( TAG, |