From 1564e02c5f7a51071c58db0b15274b00a87f2dda Mon Sep 17 00:00:00 2001 From: Beth Thibodeau Date: Thu, 17 Jun 2021 17:21:55 -0400 Subject: Fix stray AOD animation Both QS and QQS transition to lockscreen with a fade now, so we never need to animate in that case Fixes: 190018579 Test: manual Change-Id: I0bdf8140326525930181a969093b627a30658050 --- .../com/android/systemui/media/MediaHierarchyManager.kt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt index edbf18789e28..196bb02299c6 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt @@ -663,15 +663,11 @@ class MediaHierarchyManager @Inject constructor( return true } - if (statusbarState == StatusBarState.KEYGUARD) { - if (currentLocation == LOCATION_LOCKSCREEN && - previousLocation == LOCATION_QS || - (currentLocation == LOCATION_QS && - previousLocation == LOCATION_LOCKSCREEN)) { - // We're always fading from lockscreen to keyguard in situations where the player - // is already fully hidden - return false - } + if (statusbarState == StatusBarState.KEYGUARD && (currentLocation == LOCATION_LOCKSCREEN || + previousLocation == LOCATION_LOCKSCREEN)) { + // We're always fading from lockscreen to keyguard in situations where the player + // is already fully hidden + return false } return mediaFrame.isShownNotFaded || animator.isRunning || animationPending } -- cgit v1.2.3-59-g8ed1b