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

Commit 1564e02c authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Fix stray AOD animation 

Both QS and QQS transition to lockscreen with a fade now, so we
never need to animate in that case

Fixes: 190018579
Test: manual
Change-Id: I0bdf8140326525930181a969093b627a30658050
parent 100b0929

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

+5 −9
Original line number Diff line number Diff line
@@ -663,16 +663,12 @@ class MediaHierarchyManager @Inject constructor( 
            return true

        }



        if (statusbarState == StatusBarState.KEYGUARD) {

            if (currentLocation == LOCATION_LOCKSCREEN &&

                previousLocation == LOCATION_QS ||

                (currentLocation == LOCATION_QS &&

        if (statusbarState == StatusBarState.KEYGUARD && (currentLocation == LOCATION_LOCKSCREEN ||

                        previousLocation == LOCATION_LOCKSCREEN)) {

            // We're always fading from lockscreen to keyguard in situations where the player

            // is already fully hidden

            return false

        }

        }

        return mediaFrame.isShownNotFaded || animator.isRunning || animationPending

    }