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

Commit 2cd3e9c5 authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev 

am: 70739fb8

Change-Id: Ie2014ee92ec3fb629801b18465ec42c36b6e2283
parents 89255bab 70739fb8

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationSwipeActionHelper.java

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ public interface NotificationSwipeActionHelper { 


    public boolean isDismissGesture(MotionEvent ev);



    public boolean isFalseGesture(MotionEvent ev);



    public boolean swipedFarEnough(float translation, float viewSize);



    public boolean swipedFastEnough(float translation, float velocity);

packages/SystemUI/src/com/android/systemui/SwipeHelper.java

+7 −3
Original line number Diff line number Diff line
@@ -653,15 +653,19 @@ public class SwipeHelper implements Gefingerpoken { 
    }



    public boolean isDismissGesture(MotionEvent ev) {

        return ev.getActionMasked() == MotionEvent.ACTION_UP

                && !isFalseGesture(ev) && (swipedFastEnough() || swipedFarEnough())

                && mCallback.canChildBeDismissed(mCurrView);

    }



    public boolean isFalseGesture(MotionEvent ev) {

        boolean falsingDetected = mCallback.isAntiFalsingNeeded();

        if (mFalsingManager.isClassiferEnabled()) {

            falsingDetected = falsingDetected && mFalsingManager.isFalseTouch();

        } else {

            falsingDetected = falsingDetected && !mTouchAboveFalsingThreshold;

        }

        return !falsingDetected && (swipedFastEnough() || swipedFarEnough())

                && ev.getActionMasked() == MotionEvent.ACTION_UP

                && mCallback.canChildBeDismissed(mCurrView);

        return falsingDetected;

    }



    protected boolean swipedFastEnough() {

packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java

+2 −1
Original line number Diff line number Diff line
@@ -337,7 +337,8 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl 
            } else {

                snapBack(animView, velocity);

            }

        } else if ((swipedEnoughToShowMenu() && (!gestureFastEnough || showMenuForSlowOnGoing))

        } else if (!mSwipeHelper.isFalseGesture(ev)

                && (swipedEnoughToShowMenu() && (!gestureFastEnough || showMenuForSlowOnGoing))

                || (gestureTowardsMenu && !mSwipeHelper.isDismissGesture(ev))) {

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

            showMenu(animView, menuSnapTarget, velocity);

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

+4 −0
Original line number Diff line number Diff line
@@ -4353,6 +4353,10 @@ public class NotificationStackScrollLayout extends ViewGroup 
            mStatusBar.setNotificationSnoozed(sbn, snoozeOption);

        }



        public boolean isFalseGesture(MotionEvent ev) {

            return super.isFalseGesture(ev);

        }



        private void handleMenuCoveredOrDismissed() {

            if (mMenuExposedView != null && mMenuExposedView == mTranslatingParentView) {

                mMenuExposedView = null;