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

Commit 67ee164f authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Do not expand quick settings when shade first opens" into sc-dev am: 8b6cc5fd 

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

Change-Id: I1418c086bccd6a72e5af31d4f76843b9c4703dd4
parents baee0e00 8b6cc5fd

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -2203,7 +2203,7 @@ public class NotificationPanelViewController extends PanelViewController { 
        final int qsPanelBottomY = calculateQsBottomPosition(computeQsExpansionFraction());

        final boolean visible = (computeQsExpansionFraction() > 0 || qsPanelBottomY > 0)

                && !mShouldUseSplitNotificationShade;

        setQsExpansionEnabled(mAmbientState.getScrollY() == 0);

        setQsExpansionEnabled(mAmbientState.getScrollY() == 0 && !mAmbientState.isShadeOpening());



        if (!mShouldUseSplitNotificationShade) {

            if (mTransitioningToFullShadeProgress > 0.0f) {