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 am: b01c33a788

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15018782

Change-Id: I7e06a1913043f60c4b5a48c5a3124be9adbf43bf
This commit is contained in:
Beth Thibodeau
2021-06-22 18:23:54 +00:00
committed by Automerger Merge Worker
parent 3ae436c2ba b01c33a788
commit 4d97f9790a
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
} }