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

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

Merge "Disable unlocked screen off when the panel is expanded." into main

parents 3ce3461d 4d89d990
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -346,6 +346,19 @@ constructor(
            return false
        }

        // 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.
        if (
            (!this::centralSurfaces.isInitialized ||
                panelExpansionInteractorLazy.get().isPanelExpanded) &&
                // Status bar might be expanded because we have started
                // playing the animation already
                !isAnimationPlaying()
        ) {
            return false
        }

        // We only play the unlocked screen off animation if we are... unlocked.
        if (statusBarStateControllerImpl.state != StatusBarState.SHADE) {
            return false