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

Merge "Fix transition after restarting inactive media" into sc-dev

Browse Source
This commit is contained in:
Beth Thibodeau
2021-07-01 17:53:52 +00:00
committed by Android (Google) Code Review
parent b827a8ac83 5511a4d8ce
commit 5b5417285e
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -537,8 +537,19 @@ class MediaHierarchyManager @Inject constructor(
) { ) {
val desiredLocation = calculateLocation() val desiredLocation = calculateLocation()
if (desiredLocation != this.desiredLocation || forceStateUpdate) { if (desiredLocation != this.desiredLocation || forceStateUpdate) {
if (this.desiredLocation >= 0) { if (this.desiredLocation >= 0 && desiredLocation != this.desiredLocation) {
// Only update previous location when it actually changes
previousLocation = this.desiredLocation previousLocation = this.desiredLocation
} else if (forceStateUpdate) {
val onLockscreen = (!bypassController.bypassEnabled &&
(statusbarState == StatusBarState.KEYGUARD ||
statusbarState == StatusBarState.FULLSCREEN_USER_SWITCHER))
if (desiredLocation == LOCATION_QS && previousLocation == LOCATION_LOCKSCREEN &&
!onLockscreen) {
// If media active state changed and the device is now unlocked, update the
// previous location so we animate between the correct hosts
previousLocation = LOCATION_QQS
}
} }
val isNewView = this.desiredLocation == -1 val isNewView = this.desiredLocation == -1
this.desiredLocation = desiredLocation this.desiredLocation = desiredLocation