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

Commit b272ead9 authored by Michael Mikhail's avatar Michael Mikhail Committed by Android (Google) Code Review
Browse files

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

parents 70a74616 ecd9e0c0

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)