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

Merge "Fix paused player glitch on lock screen" into rvc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2020-06-19 04:09:33 +00:00
committed by Android (Google) Code Review
parent 14849cfbd4 7d52dd65ec
commit 9aeedae3a1
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,6 +193,8 @@ class MediaHierarchyManager @Inject constructor(
override fun onDozingChanged(isDozing: Boolean) { override fun onDozingChanged(isDozing: Boolean) {
if (!isDozing) { if (!isDozing) {
dozeAnimationRunning = false dozeAnimationRunning = false
} else {
updateDesiredLocation()
} }
} }
}) })
@@ -510,12 +512,19 @@ class MediaHierarchyManager @Inject constructor(
(statusbarState == StatusBarState.KEYGUARD || (statusbarState == StatusBarState.KEYGUARD ||
statusbarState == StatusBarState.FULLSCREEN_USER_SWITCHER)) statusbarState == StatusBarState.FULLSCREEN_USER_SWITCHER))
val allowedOnLockscreen = notifLockscreenUserManager.shouldShowLockscreenNotifications() val allowedOnLockscreen = notifLockscreenUserManager.shouldShowLockscreenNotifications()
return when { val location = when {
qsExpansion > 0.0f && !onLockscreen -> LOCATION_QS qsExpansion > 0.0f && !onLockscreen -> LOCATION_QS
qsExpansion > 0.4f && onLockscreen -> LOCATION_QS qsExpansion > 0.4f && onLockscreen -> LOCATION_QS
onLockscreen && allowedOnLockscreen -> LOCATION_LOCKSCREEN onLockscreen && allowedOnLockscreen -> LOCATION_LOCKSCREEN
else -> LOCATION_QQS else -> LOCATION_QQS
} }
// When we're on lock screen and the player is not active, we should keep it in QS.
// Otherwise it will try to animate a transition that doesn't make sense.
if (location == LOCATION_LOCKSCREEN && getHost(location)?.visible != true &&
!statusBarStateController.isDozing) {
return LOCATION_QS
}
return location
} }
companion object { companion object {