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

Commit 64c1f5c9 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Don't animate unlocked screen off if QS is expanded 

Instead of determining whether to run the unlocked screen
off animation based on fullyCollapsed, check isExpanded which is
the expanded state onPanelExpansionChanged uses when
sending panel expansion updates to listeners.
This eventually updates
  DozeParameters#canControlScreenOff => and then checks
UnlockedScreenOffAnimationController#shouldPlayUnlockedScreenOffAnimation

Test: manually swipe down from home screen to
reveal QS, then press power button to AoD, no animation/jank
Fixes: 228786469

Change-Id: I0384e1300b6b50aaa8a119d11bf71186fb5379e8
parent 9c9916e4

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