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

Commit 870d90d6 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Don't animate unlocked screen off if QS is expanded" into tm-dev am:... 

Merge "Don't animate unlocked screen off if QS is expanded" into tm-dev am: c495949e am: fd3a9f29

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



Change-Id: I9b91f782d047e289d9952511a96b3ad614a6e39f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4aedebae fd3a9f29

packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt

+2 −2
Original line number Diff line number Diff line
@@ -311,9 +311,9 @@ class UnlockedScreenOffAnimationController @Inject constructor( 


        // We currently draw both the light reveal scrim, and the AOD UI, in the shade. If it's

        // already expanded and showing notifications/QS, the animation looks really messy. For now,

        // disable it if the notification panel is not fully collapsed.

        // disable it if the notification panel is expanded.

        if ((!this::mCentralSurfaces.isInitialized ||

                !mCentralSurfaces.notificationPanelViewController.isFullyCollapsed) &&

                mCentralSurfaces.notificationPanelViewController.isExpanded) &&

                // Status bar might be expanded because we have started

                // playing the animation already

                !isAnimationPlaying()