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

Merge into jb-mr1-dev

Browse Source 
Change-Id: Ib0523ded92e2fe4be6a32d092baa55b527229c07
This commit is contained in:
Jean-Baptiste Queru
2012-09-25 09:41:58 -07:00
parent 56d8cc1031 03e7b88815
commit fe3632bcbe
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ import android.gesture.GestureStore;
import android.gesture.GestureStroke; import android.gesture.GestureStroke;
import android.gesture.Prediction; import android.gesture.Prediction;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Slog; import android.util.Slog;
@@ -687,15 +686,10 @@ class TouchExplorer implements EventStreamTransformation {
} }
} break; } break;
case MotionEvent.ACTION_POINTER_UP: { case MotionEvent.ACTION_POINTER_UP: {
final int activePointerCount = mReceivedPointerTracker.getActivePointerCount(); final int pointerId = event.getPointerId(event.getActionIndex());
switch (activePointerCount) { if (mReceivedPointerTracker.isActiveOrWasLastActiveUpPointer(pointerId)) {
case 1: { sendUpForInjectedDownPointers(event, policyFlags);
// Send an event to the end of the drag gesture. mCurrentState = STATE_TOUCH_EXPLORING;
sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
} break;
default: {
mCurrentState = STATE_TOUCH_EXPLORING;
}
} }
} break; } break;
case MotionEvent.ACTION_UP: { case MotionEvent.ACTION_UP: {