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

Commit 3d896663 authored by Josh Tsuji's avatar Josh Tsuji Committed by Android (Google) Code Review
Browse files

Merge "Fix issue where screen off is disabled after expanding then collapsing... 

Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev
parents b8a20acc cd3c4ec4

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

+2 −3
Original line number Diff line number Diff line
@@ -199,10 +199,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 expanded.

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

        if (!this::statusBar.isInitialized ||

                statusBar.notificationPanelViewController.isFullyExpanded ||

                statusBar.notificationPanelViewController.isExpanding) {

                !statusBar.notificationPanelViewController.isFullyCollapsed) {

            return false

        }