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

Commit 0fa5652e authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Disable flexy straw when in QS"

parents ed2f4b77 341d1821

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

+2 −2
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
            return mScrollView.onTouchEvent(ev);

        }

        boolean expandWantsIt = false;

        if (!mSwipingInProgress && !mOnlyScrollingInThisMotion) {

        if (!mSwipingInProgress && !mOnlyScrollingInThisMotion && isScrollingEnabled()) {

            if (isCancelOrUp) {

                mExpandHelper.onlyObserveMovements(false);

            }
@@ -1376,7 +1376,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
        }

        initDownStates(ev);

        boolean expandWantsIt = false;

        if (!mSwipingInProgress && !mOnlyScrollingInThisMotion) {

        if (!mSwipingInProgress && !mOnlyScrollingInThisMotion && isScrollingEnabled()) {

            expandWantsIt = mExpandHelper.onInterceptTouchEvent(ev);

        }

        boolean scrollWantsIt = false;