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

Commit 47386b12 authored by Edward Savage-Jones's avatar Edward Savage-Jones Committed by android-build-merger
Browse files

Merge "Merge "IllegalArgumentException in MagnificationGestureHandler" am:... 

Merge "Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff4619 am: f124c726 am: 99317517" into oc-mr1-dev-plus-aosp
am: 0583aa87

Change-Id: I9c30e65127c5148dc58c45f27ddbd4f70a284aa3
parents 14e5e1c4 0583aa87

services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ class MagnificationGestureHandler implements EventStreamTransformation { 
                }

                break;

                case MotionEvent.ACTION_UP: {

                    mHandler.removeMessages(MESSAGE_ON_ACTION_TAP_AND_HOLD);

                    if (!mMagnificationController.magnificationRegionContains(

                            event.getX(), event.getY())) {

                        transitionToDelegatingState(!mShortcutTriggered);
@@ -703,7 +704,6 @@ class MagnificationGestureHandler implements EventStreamTransformation { 
                    if (mLastDownEvent == null) {

                        return;

                    }

                    mHandler.removeMessages(MESSAGE_ON_ACTION_TAP_AND_HOLD);

                    if (!GestureUtils.isTap(mLastDownEvent, event, mTapTimeSlop,

                            mTapDistanceSlop, 0)) {

                        transitionToDelegatingState(true);