Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a40fb535 authored by Michael Mikhail's avatar Michael Mikhail Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I87d203430a40617290c5a93de72f47618fb69a1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f272fbf b272ead9

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

+10 −0
Original line number Diff line number Diff line
@@ -798,6 +798,16 @@ constructor( 
            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 (

            statusbarState == StatusBarState.KEYGUARD &&

                (currentLocation == LOCATION_LOCKSCREEN || previousLocation == LOCATION_LOCKSCREEN)