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

Commit 3a709919 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 04fb2587: Fixed the touch handling when QS was open 

* commit '04fb2587':
  Fixed the touch handling when QS was open
parents 4a8eb988 04fb2587

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

+2 −3
Original line number Diff line number Diff line
@@ -638,10 +638,9 @@ public class NotificationPanelView extends PanelView implements 


    @Override

    protected boolean isInContentBounds(float x, float y) {

        float yTransformed = y - mNotificationStackScroller.getY();

        float stackScrollerX = mNotificationStackScroller.getX();

        return mNotificationStackScroller.isInContentBounds(yTransformed) && stackScrollerX < x

                && x < stackScrollerX + mNotificationStackScroller.getWidth();

        return !mNotificationStackScroller.isBelowLastNotification(x - stackScrollerX, y)

                && stackScrollerX < x && x < stackScrollerX + mNotificationStackScroller.getWidth();

    }



    private void initDownStates(MotionEvent event) {

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

+2 −2
Original line number Diff line number Diff line
@@ -2614,7 +2614,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
        }

    }



    private boolean isBelowLastNotification(float touchX, float touchY) {

    public boolean isBelowLastNotification(float touchX, float touchY) {

        int childCount = getChildCount();

        for (int i = childCount - 1; i >= 0; i--) {

            ExpandableView child = (ExpandableView) getChildAt(i);
@@ -2640,7 +2640,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
                }

            }

        }

        return touchY > mIntrinsicPadding;

        return touchY > mTopPadding + mStackTranslation;

    }



    private void updateExpandButtons() {