diff options
| author | 2022-11-28 23:07:59 +0000 | |
|---|---|---|
| committer | 2022-11-28 23:07:59 +0000 | |
| commit | a749d232330b5ee4352cf1d0911e6c9e9c83ea40 (patch) | |
| tree | fde26c8790c979c2d657d8587bccf0f20e54d13f | |
| parent | 99c127730e858906e032c2afce8a2536760466ab (diff) | |
| parent | a40fb53567553125f88e606810bc451ef2c7ceb0 (diff) | |
Merge "Fix media control flash when unlock device" into tm-qpr-dev am: b272ead9bb am: a40fb53567
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20519892
Change-Id: I26f71f5a0ffd9060f3e0ad7ee6da4fee9144f52e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt index cbb670ebf02d..b252be1b4cdc 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaHierarchyManager.kt @@ -799,6 +799,16 @@ constructor( } 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 ( statusbarState == StatusBarState.KEYGUARD && (currentLocation == LOCATION_LOCKSCREEN || previousLocation == LOCATION_LOCKSCREEN) ) { |