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

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

Merge "QS in split shade should listen to changes earlier" into tm-qpr-dev

parents fd8565ce 773e7877

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -515,7 +515,13 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
    public void setExpanded(boolean expanded) {

    public void setExpanded(boolean expanded) {

        if (DEBUG) Log.d(TAG, "setExpanded " + expanded);

        if (DEBUG) Log.d(TAG, "setExpanded " + expanded);

        mQsExpanded = expanded;

        mQsExpanded = expanded;

        if (mInSplitShade && mQsExpanded) {

            // in split shade QS is expanded immediately when shade expansion starts and then we

            // also need to listen to changes - otherwise QS is updated only once its fully expanded

            setListening(true);

        } else {

            updateQsPanelControllerListening();

            updateQsPanelControllerListening();

        }

        updateQsState();

        updateQsState();

    }

    }

packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -439,6 +439,17 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { 
        verify(mQSPanelController).setExpanded(false);

        verify(mQSPanelController).setExpanded(false);

    }

    }





    @Test

    public void startsListeningAfterStateChangeToExpanded_inSplitShade() {

        QSFragment fragment = resumeAndGetFragment();

        enableSplitShade();

        fragment.setQsVisible(true);

        clearInvocations(mQSPanelController);



        fragment.setExpanded(true);

        verify(mQSPanelController).setListening(true, true);

    }



    @Override

    @Override

    protected Fragment instantiate(Context context, String className, Bundle arguments) {

    protected Fragment instantiate(Context context, String className, Bundle arguments) {

        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);