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

Merge "Dragging in touch explore mode should not become exploring." into ics-mr0

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-10-11 18:39:36 -07:00
committed by Android (Google) Code Review
parent c5b28bd00d 2e1c66bd53
commit 5276373430
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,6 +457,9 @@ public class TouchExplorer implements Explorer {
case MotionEvent.ACTION_MOVE: {
final int activePointerCount = mPointerTracker.getActivePointerCount();
switch (activePointerCount) {
case 1: {
// do nothing
} break;
case 2: {
if (isDraggingGesture(event)) {
// If still dragging send a drag event.
@@ -484,10 +487,12 @@ public class TouchExplorer implements Explorer {
}
} break;
case MotionEvent.ACTION_POINTER_UP: {
mCurrentState = STATE_TOUCH_EXPLORING;
// Send an event to the end of the drag gesture.
sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
} break;
case MotionEvent.ACTION_UP: {
mCurrentState = STATE_TOUCH_EXPLORING;
} break;
case MotionEvent.ACTION_CANCEL: {
clear();
} break;
@@ -500,7 +505,7 @@ public class TouchExplorer implements Explorer {
* @param event The event to be handled.
* @param policyFlags The policy flags associated with the event.
*/
public void handleMotionEventStateDelegating(MotionEvent event, int policyFlags) {
private void handleMotionEventStateDelegating(MotionEvent event, int policyFlags) {
switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN: {
throw new IllegalStateException("Delegating state can only be reached if "