Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e am: f124c72600 am: 99317517cb" into oc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-08-30 21:36:06 +00:00
committed by Android (Google) Code Review
parent abde450589 41ef8e42bb
commit 0583aa8749
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java
View File

@@ -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);