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

Commit b77a6806 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use non-deprecated method to check shade expansion." into main

parents 1d97e2e9 d37a55d3

packages/SystemUI/src/com/android/systemui/shade/domain/interactor/PanelExpansionInteractor.kt

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ interface PanelExpansionInteractor { 
     * Returns whether the shade height is greater than zero or the shade is expecting a synthesized

     * down event.

     */

    @Deprecated("Use ShadeInteractor.isAnyExpanded instead.") val isPanelExpanded: Boolean

    @Deprecated("Legitimately deprecated and broken. Use ShadeInteractor.isAnyExpanded instead.")

    val isPanelExpanded: Boolean



    /**

     * This method should not be used anymore, you should probably use [.isShadeFullyOpen] instead.

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

+1 −2
Original line number Diff line number Diff line
@@ -353,8 +353,7 @@ constructor( 
        // 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) &&

            (!this::centralSurfaces.isInitialized || statusBarStateControllerImpl.isExpanded) &&

                // Status bar might be expanded because we have started

                // playing the animation already

                !isAnimationPlaying()