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

Commit 9fd962fc authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Making sure collapseOrExpandedQs doesn't do anything in split shade"... 

Merge "Making sure collapseOrExpandedQs doesn't do anything in split shade" into tm-qpr-dev am: f7c1cc0e am: d8a601b6

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



Change-Id: If72a324f8cc9826d7f1ebca6df25a50065d6c61c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5ae9599 d8a601b6

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -1378,6 +1378,9 @@ public class QuickSettingsController { 
    }

    }





    private void collapseOrExpandQs() {

    private void collapseOrExpandQs() {

        if (mSplitShadeEnabled) {

            return; // QS is always expanded in split shade

        }

        onExpansionStarted();

        onExpansionStarted();

        if (getExpanded()) {

        if (getExpanded()) {

            flingQs(0, FLING_COLLAPSE, null, true);

            flingQs(0, FLING_COLLAPSE, null, true);