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

Commit 55f111e2 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

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

Change-Id: Ic918be32c82845c09c04f0e7897ff239eb74b975
parents 84f0f0f9 f251391e

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);