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

Commit 5cf5a91b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "QS in split shade should listen to changes earlier" into tm-qpr-dev am: ed19f58a am: 8985cfc6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20388345



Change-Id: I6c4813f60249fa07a102da3d07e390c040eccb6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce3e3c43 8985cfc6

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

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

        if (DEBUG) Log.d(TAG, "setExpanded " + 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();

        }

        updateQsState();

    }

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

+11 −0
Original line number Diff line number Diff line
@@ -439,6 +439,17 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { 
        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

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

        MockitoAnnotations.initMocks(this);