diff options
2 files changed, 29 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaController.kt index e15e03822610..a161c7b01a1a 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaController.kt @@ -230,18 +230,12 @@ constructor( val currentAllowMediaPlayerOnLockScreen = allowMediaPlayerOnLockScreen val useSplitShade = useSplitShade val shouldBeVisibleForSplitShade = shouldBeVisibleForSplitShade() - visible = isMediaHostVisible && isBypassNotEnabled && keyguardOrUserSwitcher && currentAllowMediaPlayerOnLockScreen && shouldBeVisibleForSplitShade - if (visible) { - showMediaPlayer() - } else { - hideMediaPlayer() - } logger.logRefreshMediaPosition( reason = reason, visible = visible, @@ -251,8 +245,17 @@ constructor( mediaHostVisible = isMediaHostVisible, bypassNotEnabled = isBypassNotEnabled, currentAllowMediaPlayerOnLockScreen = currentAllowMediaPlayerOnLockScreen, - shouldBeVisibleForSplitShade = shouldBeVisibleForSplitShade + shouldBeVisibleForSplitShade = shouldBeVisibleForSplitShade, ) + val currActiveContainer = activeContainer + + logger.logActiveMediaContainer("before refreshMediaPosition", currActiveContainer) + if (visible) { + showMediaPlayer() + } else { + hideMediaPlayer() + } + logger.logActiveMediaContainer("after refreshMediaPosition", currActiveContainer) lastUsedStatusBarState = currentState } @@ -325,4 +328,7 @@ constructor( } } } + + private val activeContainer: ViewGroup? = + if (useSplitShade) splitShadeContainer else singlePaneContainer } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaControllerLogger.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaControllerLogger.kt index 41fef88645a2..0dd4b580f95e 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaControllerLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/KeyguardMediaControllerLogger.kt @@ -16,6 +16,7 @@ package com.android.systemui.media.controls.ui +import android.view.ViewGroup import com.android.systemui.log.LogBuffer import com.android.systemui.log.core.LogLevel.DEBUG import com.android.systemui.log.dagger.KeyguardMediaControllerLog @@ -36,8 +37,8 @@ constructor(@KeyguardMediaControllerLog private val logBuffer: LogBuffer) { mediaHostVisible: Boolean, bypassNotEnabled: Boolean, currentAllowMediaPlayerOnLockScreen: Boolean, - shouldBeVisibleForSplitShade: Boolean - ) = + shouldBeVisibleForSplitShade: Boolean, + ) { logBuffer.log( TAG, DEBUG, @@ -63,6 +64,19 @@ constructor(@KeyguardMediaControllerLog private val logBuffer: LogBuffer) { "shouldBeVisibleForSplitShade=$str3)" } ) + } + + fun logActiveMediaContainer(reason: String, activeContainer: ViewGroup?) { + logBuffer.log( + TAG, + DEBUG, + { + str1 = reason + str2 = activeContainer.toString() + }, + { "activeMediaContainerVisibility(reason=$str1, activeContainer=$str2)" } + ) + } private companion object { private const val TAG = "KeyguardMediaControllerLog" |