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

Commit e10682b7 authored by Jean Chen's avatar Jean Chen Committed by Android (Google) Code Review
Browse files

Merge "Remove redundant code logic to improve readability" into main

parents aa12d092 a0b05999

services/accessibility/java/com/android/server/accessibility/gestures/MultiTap.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ public class MultiTap extends GestureMatcher { 




    @Override

    @Override

    protected void onUp(MotionEvent event, MotionEvent rawEvent, int policyFlags) {

    protected void onUp(MotionEvent event, MotionEvent rawEvent, int policyFlags) {

        cancelAfterDoubleTapTimeout(event, rawEvent, policyFlags);

        cancelPendingTransitions();

        if (!isInsideSlop(rawEvent, mTouchSlop)) {

        if (!isInsideSlop(rawEvent, mTouchSlop)) {

            cancelGesture(event, rawEvent, policyFlags);

            cancelGesture(event, rawEvent, policyFlags);

        }

        }

services/accessibility/java/com/android/server/accessibility/gestures/MultiTapAndHold.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,6 @@ public class MultiTapAndHold extends MultiTap { 
    @Override

    @Override

    protected void onUp(MotionEvent event, MotionEvent rawEvent, int policyFlags) {

    protected void onUp(MotionEvent event, MotionEvent rawEvent, int policyFlags) {

        super.onUp(event, rawEvent, policyFlags);

        super.onUp(event, rawEvent, policyFlags);

        cancelAfterDoubleTapTimeout(event, rawEvent, policyFlags);

    }

    }





    @Override

    @Override