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

Commit 7fda2cee authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[flexiglass] Remove remaining usages of qsExpansionFraction 

The NSSL no longer needs to know about the QS state.

Bug: 360106096
Flag: com.android.systemui.scene_container
Test: verified code paths manually
Change-Id: I928f9d00de08268f65436a4693c4efd23fdf3ed9
parent ecc1b58d

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

+11 −7
Original line number Diff line number Diff line
@@ -1063,13 +1063,17 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum 
        mScrimController.setQsPosition(qsExpansionFraction, qsPanelBottomY);

        setClippingBounds();



        if (!SceneContainerFlag.isEnabled()) {

            if (mSplitShadeEnabled) {

            // In split shade we want to pretend that QS are always collapsed so their behaviour and

            // interactions don't influence notifications as they do in portrait. But we want to set

            // 0 explicitly in case we're rotating from non-split shade with QS expansion of 1.

                // In split shade we want to pretend that QS are always collapsed so their

                // behaviour and interactions don't influence notifications as they do in portrait.

                // But we want to set 0 explicitly in case we're rotating from non-split shade with

                // QS expansion of 1.

                mNotificationStackScrollLayoutController.setQsExpansionFraction(0);

            } else {

            mNotificationStackScrollLayoutController.setQsExpansionFraction(qsExpansionFraction);

                mNotificationStackScrollLayoutController.setQsExpansionFraction(

                        qsExpansionFraction);

            }

        }



        mDepthController.setQsPanelExpansion(qsExpansionFraction);

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+1 −0
Original line number Diff line number Diff line
@@ -5156,6 +5156,7 @@ public class NotificationStackScrollLayout 
    }



    public void setQsExpansionFraction(float qsExpansionFraction) {

        SceneContainerFlag.assertInLegacyMode();

        boolean footerAffected = mQsExpansionFraction != qsExpansionFraction

                && (mQsExpansionFraction == 1 || qsExpansionFraction == 1);

        mQsExpansionFraction = qsExpansionFraction;

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+1 −0
Original line number Diff line number Diff line
@@ -1275,6 +1275,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
    }



    public void setQsExpansionFraction(float expansionFraction) {

        SceneContainerFlag.assertInLegacyMode();

        mView.setQsExpansionFraction(expansionFraction);

    }