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

Commit 084f5555 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Don't consider HUN for QS isPanelExpanded" into main

parents 1908ff39 9e411832

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -3239,16 +3239,19 @@ public final class NotificationPanelViewController implements 
            boolean isExpanded = isExpanded();

            boolean isExpanded = isExpanded();

            mShadeExpansionStateManager.onPanelExpansionChanged(

            mShadeExpansionStateManager.onPanelExpansionChanged(

                    mExpandedFraction, isExpanded, isTracking());

                    mExpandedFraction, isExpanded, isTracking());

            mQsController.setPanelExpanded(isExpanded);

            mQsController.setPanelExpanded(isExpandedWithoutHeadsUp());

        }

        }

        updateVisibility();

        updateVisibility();

    }

    }





    @Override

    @Override

    public boolean isExpanded() {

    public boolean isExpanded() {

        return isExpandedWithoutHeadsUp() || isPanelVisibleBecauseOfHeadsUp();

    }



    private boolean isExpandedWithoutHeadsUp() {

        return mExpandedFraction > 0f

        return mExpandedFraction > 0f

                || mInstantExpanding

                || mInstantExpanding

                || isPanelVisibleBecauseOfHeadsUp()

                || isTracking()

                || isTracking()

                || mHeightAnimator != null

                || mHeightAnimator != null

                || isPanelVisibleBecauseScrimIsAnimatingOff()

                || isPanelVisibleBecauseScrimIsAnimatingOff()