Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix stray AOD animation" into sc-dev

Browse Source
This commit is contained in:
Beth Thibodeau
2021-06-22 18:19:15 +00:00
committed by Android (Google) Code Review
parent 343684b523 1564e02c5f
commit b01c33a788
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt
View File

@@ -660,16 +660,12 @@ class MediaHierarchyManager @Inject constructor(
return true return true
} }
if (statusbarState == StatusBarState.KEYGUARD) { if (statusbarState == StatusBarState.KEYGUARD && (currentLocation == LOCATION_LOCKSCREEN ||
if (currentLocation == LOCATION_LOCKSCREEN &&
previousLocation == LOCATION_QS ||
(currentLocation == LOCATION_QS &&
previousLocation == LOCATION_LOCKSCREEN)) { previousLocation == LOCATION_LOCKSCREEN)) {
// We're always fading from lockscreen to keyguard in situations where the player // We're always fading from lockscreen to keyguard in situations where the player
// is already fully hidden // is already fully hidden
return false return false
} }
}
return mediaFrame.isShownNotFaded || animator.isRunning || animationPending return mediaFrame.isShownNotFaded || animator.isRunning || animationPending
} }