nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 50f0388e: Merge "Fix gesture floating preview on up event" into jb-mr1-dev 

* commit '50f0388ee6515e9d52a1cb202e02dc5492d47d61':
  Fix gesture floating preview on up event
main
Tadashi G. Takaoka 2012-09-13 03:23:27 -07:00 committed by Android Git Automerger
parent 9950879447 50f0388ee6
commit ae65d19e5a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
java/src/com/android/inputmethod/keyboard/PointerTracker.java
View File

@ -545,12 +545,15 @@ public class PointerTracker implements PointerTrackerQueue.Element {
} }
private void startBatchInput() { private void startBatchInput() {
if (DEBUG_LISTENER) { if (!sInGesture && mGestureStrokeWithPreviewTrail.isStartOfAGesture()) {
Log.d(TAG, "onStartBatchInput"); if (DEBUG_LISTENER) {
Log.d(TAG, "onStartBatchInput");
}
sInGesture = true;
mListener.onStartBatchInput();
} }
sInGesture = true; final boolean isOldestTracker = sPointerTrackerQueue.getOldestElement() == this;
mListener.onStartBatchInput(); mDrawingProxy.showGesturePreviewTrail(this, isOldestTracker);
mDrawingProxy.showGesturePreviewTrail(this, true /* isOldestTracker */);
} }
private void updateBatchInput(final long eventTime) { private void updateBatchInput(final long eventTime) {
@ -585,7 +588,8 @@ public class PointerTracker implements PointerTrackerQueue.Element {
clearBatchInputPointsOfAllPointerTrackers(); clearBatchInputPointsOfAllPointerTrackers();
} }
} }
mDrawingProxy.showGesturePreviewTrail(this, true /* isOldestTracker */); final boolean isOldestTracker = sPointerTrackerQueue.getOldestElement() == this;
mDrawingProxy.showGesturePreviewTrail(this, isOldestTracker);
} }
private static void abortBatchInput() { private static void abortBatchInput() {
@ -721,12 +725,8 @@ public class PointerTracker implements PointerTrackerQueue.Element {
final boolean isHistorical, final Key key) { final boolean isHistorical, final Key key) {
final int gestureTime = (int)(eventTime - sGestureFirstDownTime); final int gestureTime = (int)(eventTime - sGestureFirstDownTime);
if (mIsDetectingGesture) { if (mIsDetectingGesture) {
final GestureStroke stroke = mGestureStrokeWithPreviewTrail; mGestureStrokeWithPreviewTrail.addPoint(x, y, gestureTime, isHistorical);
stroke.addPoint(x, y, gestureTime, isHistorical); startBatchInput();
if (!sInGesture && stroke.isStartOfAGesture()) {
startBatchInput();
}
if (sInGesture && key != null) { if (sInGesture && key != null) {
updateBatchInput(eventTime); updateBatchInput(eventTime);
} }