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

Commit bbb539a1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes notification swipe snapping when menu is empty."

parents bc93e0f5 fe15aa1f

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java

+6 −3
Original line number Diff line number Diff line
@@ -189,10 +189,13 @@ class NotificationSwipeHelper extends SwipeHelper 
        boolean isFastNonDismissGesture =

                gestureFastEnough && !gestureTowardsMenu && !isDismissGesture;

        boolean isMenuRevealingGestureAwayFromMenu = slowSwipedFarEnough || isFastNonDismissGesture;

        if (isNonDismissGestureTowardsMenu

                || (!isFalseGesture(ev) && isMenuRevealingGestureAwayFromMenu)) {

        int menuSnapTarget = menuRow.getMenuSnapTarget();

        boolean isNonFalseMenuRevealingGesture =

                !isFalseGesture(ev) && isMenuRevealingGestureAwayFromMenu;

        if ((isNonDismissGestureTowardsMenu || isNonFalseMenuRevealingGesture)

                && menuSnapTarget != 0) {

            // Menu has not been snapped to previously and this is menu revealing gesture

            snapOpen(animView, menuRow.getMenuSnapTarget(), velocity);

            snapOpen(animView, menuSnapTarget, velocity);

            menuRow.onSnapOpen();

        } else if (isDismissGesture(ev) && !gestureTowardsMenu) {

            dismiss(animView, velocity);