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

Merge "Fix media control flash when unlock device" into tm-qpr-dev am: b272ead9bb

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

Change-Id: I87d203430a40617290c5a93de72f47618fb69a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michael Mikhail
2022-11-28 22:36:19 +00:00
committed by Automerger Merge Worker
parent 5f272fbf7c b272ead9bb
commit a40fb53567
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt
View File

@@ -798,6 +798,16 @@ constructor(
return true return true
} }
if (
desiredLocation == LOCATION_QS &&
previousLocation == LOCATION_LOCKSCREEN &&
statusbarState == StatusBarState.SHADE
) {
// This is an invalid transition, can happen when tapping on home control and the UMO
// while being on landscape orientation in tablet.
return false
}
if ( if (
statusbarState == StatusBarState.KEYGUARD && statusbarState == StatusBarState.KEYGUARD &&
(currentLocation == LOCATION_LOCKSCREEN || previousLocation == LOCATION_LOCKSCREEN) (currentLocation == LOCATION_LOCKSCREEN || previousLocation == LOCATION_LOCKSCREEN)