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

Commit fd12ca33 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Gate footer actions visibility by QS visibility 

With the change of the footer actions outside of QS panel, the visible
logic needs to account for this.

Test: log visibility of both footer actions and qs
Bug: 219883571
Change-Id: I30a6c66be088384d325945d0d45f2b7028ceb35c
parent 849d7d30

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+6 −3
Original line number Diff line number Diff line
@@ -381,14 +381,17 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
                : View.INVISIBLE);

        mHeader.setExpanded((keyguardShowing && !mHeaderAnimating && !mShowCollapsedOnKeyguard)

                || (expanded && !mStackScrollerOverscrolling), mQuickQSPanelController);

        boolean footerVisible = !mQsDisabled && (expanded || !keyguardShowing || mHeaderAnimating

        boolean qsPanelVisible = !mQsDisabled && expandVisually;

        boolean footerVisible = qsPanelVisible &&  (expanded || !keyguardShowing || mHeaderAnimating

                || mShowCollapsedOnKeyguard);

        mFooter.setVisibility(footerVisible ? View.VISIBLE : View.INVISIBLE);

        mQSFooterActionController.setVisible(footerVisible);

        mFooter.setExpanded((keyguardShowing && !mHeaderAnimating && !mShowCollapsedOnKeyguard)

                || (expanded && !mStackScrollerOverscrolling));

        mQSPanelController.setVisibility(

                !mQsDisabled && expandVisually ? View.VISIBLE : View.INVISIBLE);

        mQSPanelController.setVisibility(qsPanelVisible ? View.VISIBLE : View.INVISIBLE);

        if (DEBUG) {

            Log.d(TAG, "Footer: " + footerVisible + ", QS Panel: " + qsPanelVisible);

        }

    }



    private boolean isKeyguardState() {