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

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

Merge "Fixing QS expanding in split shade when swipe happens on notifications"... 

Merge "Fixing QS expanding in split shade when swipe happens on notifications" into sc-dev am: f251391e am: 55f111e2

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

Change-Id: I055fbf00112986d866de55a5e04b7df4f8a5c842
parents 0e281f1b 55f111e2

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

+6 −0
Original line number Diff line number Diff line
@@ -3708,6 +3708,12 @@ public class NotificationPanelViewController extends PanelViewController { 


        @Override

        public void flingTopOverscroll(float velocity, boolean open) {

            // in split shade mode we want to expand/collapse QS only when touch happens within QS

            if (mShouldUseSplitNotificationShade

                    && (mInitialTouchX < mQsFrame.getX()

                        || mInitialTouchX > mQsFrame.getX() + mQsFrame.getWidth())) {

                return;

            }

            mLastOverscroll = 0f;

            mQsExpansionFromOverscroll = false;

            setQsExpansion(mQsExpansionHeight);