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

Commit 6adc3669 authored by Matt Pietal's avatar Matt Pietal
Browse files

Media - Don't animate during camera gesture 

More generally, block invalid transitions from lockscreen to QQS.

Fixes: 161096422
Test: manual, camera gesture
Change-Id: I5267defa75fcc28d34138608818ed26f60f4801b
(cherry picked from commit 3cd5e856)
parent 1706f9c2

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

+10 −2
Original line number Diff line number Diff line
@@ -389,6 +389,14 @@ class MediaHierarchyManager @Inject constructor( 
        if (isCurrentlyInGuidedTransformation()) {

            return false

        }

        // This is an invalid transition, and can happen when using the camera gesture from the

        // lock screen. Disallow.

        if (previousLocation == LOCATION_LOCKSCREEN &&

            desiredLocation == LOCATION_QQS &&

            statusbarState == StatusBarState.SHADE) {

            return false

        }



        if (currentLocation == LOCATION_QQS &&

                previousLocation == LOCATION_LOCKSCREEN &&

                (statusBarStateController.leaveOpenOnKeyguardHide() ||
@@ -604,8 +612,8 @@ class MediaHierarchyManager @Inject constructor( 
            // When collapsing on the lockscreen, we want to remain in QS

            return LOCATION_QS

        }

        if (location != LOCATION_LOCKSCREEN && desiredLocation == LOCATION_LOCKSCREEN

                && !fullyAwake) {

        if (location != LOCATION_LOCKSCREEN && desiredLocation == LOCATION_LOCKSCREEN &&

                !fullyAwake) {

            // When unlocking from dozing / while waking up, the media shouldn't be transitioning

            // in an animated way. Let's keep it in the lockscreen until we're fully awake and

            // reattach it without an animation