Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev

sganov · Android (Google) Code Review · commit c5211780ce60 · 2012-09-28T17:38:33.000-07:00
diff --git a/services/java/com/android/server/accessibility/TouchExplorer.java b/services/java/com/android/server/accessibility/TouchExplorer.java
@@ -700,13 +700,6 @@ private void handleMotionEventStateDragging(MotionEvent event, int policyFlags)
                     }
                 }
             } break;
-            case MotionEvent.ACTION_POINTER_UP: {
-                final int pointerId = event.getPointerId(event.getActionIndex());
-                if (mReceivedPointerTracker.isActiveOrWasLastActiveUpPointer(pointerId)) {
-                    sendUpForInjectedDownPointers(event, policyFlags);
-                    mCurrentState = STATE_TOUCH_EXPLORING;
-                }
-             } break;
             case MotionEvent.ACTION_UP: {
                 // Announce the end of a new touch interaction.
                 sendAccessibilityEvent(

Original file line number	Diff line number	Diff line change
`@@ -700,13 +700,6 @@ private void handleMotionEventStateDragging(MotionEvent event, int policyFlags)`
`700`	`700`	`}`
`701`	`701`	`}`
`702`	`702`	`} break;`
`703`		`- case MotionEvent.ACTION_POINTER_UP: {`
`704`		`- final int pointerId = event.getPointerId(event.getActionIndex());`
`705`		`- if (mReceivedPointerTracker.isActiveOrWasLastActiveUpPointer(pointerId)) {`
`706`		`- sendUpForInjectedDownPointers(event, policyFlags);`
`707`		`- mCurrentState = STATE_TOUCH_EXPLORING;`
`708`		`- }`
`709`		`- } break;`
`710`	`703`	`case MotionEvent.ACTION_UP: {`
`711`	`704`	`// Announce the end of a new touch interaction.`
`712`	`705`	`sendAccessibilityEvent(`