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

Commit 007fdf66 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Fix stray AOD animation" into sc-dev am: b01c33a7 

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

Change-Id: I40508dd2e3548d6294704da79849202febb68cca
parents 6ec17cb8 b01c33a7

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

+5 −9
Original line number Diff line number Diff line
@@ -660,16 +660,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

    }