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

Merge "Up motion event not injected by the touch explorer at the end of a drag." into jb-mr1-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-10-02 16:27:06 -07:00
committed by Android (Google) Code Review
parent 046184f97a aeb8d0ed0d
commit 9bfb8bcfeb
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/java/com/android/server/accessibility/TouchExplorer.java
View File

@@ -198,7 +198,7 @@ class TouchExplorer implements EventStreamTransformation {
private GestureLibrary mGestureLibrary; private GestureLibrary mGestureLibrary;
// The long pressing pointer id if coordinate remapping is needed. // The long pressing pointer id if coordinate remapping is needed.
private int mLongPressingPointerId; private int mLongPressingPointerId = -1;
// The long pressing pointer X if coordinate remapping is needed. // The long pressing pointer X if coordinate remapping is needed.
private int mLongPressingPointerDeltaX; private int mLongPressingPointerDeltaX;
@@ -702,10 +702,24 @@ class TouchExplorer implements EventStreamTransformation {
} }
} }
} break; } break;
case MotionEvent.ACTION_POINTER_UP: {
final int pointerId = event.getPointerId(event.getActionIndex());
if (pointerId == mDraggingPointerId) {
mDraggingPointerId = INVALID_POINTER_ID;
// Send an event to the end of the drag gesture.
sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
}
} break;
case MotionEvent.ACTION_UP: { case MotionEvent.ACTION_UP: {
// Announce the end of a new touch interaction. // Announce the end of a new touch interaction.
sendAccessibilityEvent( sendAccessibilityEvent(
AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); AccessibilityEvent.TYPE_TOUCH_INTERACTION_END);
final int pointerId = event.getPointerId(event.getActionIndex());
if (pointerId == mDraggingPointerId) {
mDraggingPointerId = INVALID_POINTER_ID;
// Send an event to the end of the drag gesture.
sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
}
mCurrentState = STATE_TOUCH_EXPLORING; mCurrentState = STATE_TOUCH_EXPLORING;
} break; } break;
case MotionEvent.ACTION_CANCEL: { case MotionEvent.ACTION_CANCEL: {