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

Commit fd3a9f29 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: c495949e 

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



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

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()