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

am 28772899: Merge "Don\'t cancel gesture typing while more keys keyboard is shown" 

* commit '28772899d2fd0f452d1beca79c03123eaee53c0f':
  Don't cancel gesture typing while more keys keyboard is shown
main
Tadashi G. Takaoka 2013-01-09 00:28:01 -08:00 committed by Android Git Automerger
parent 23c9e9df7b 28772899d2
commit 473f8ab4a7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -791,6 +791,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
private void cancelBatchInput() { private void cancelBatchInput() {
sPointerTrackerQueue.cancelAllPointerTracker(); sPointerTrackerQueue.cancelAllPointerTracker();
mIsDetectingGesture = false;
if (!sInGesture) { if (!sInGesture) {
return; return;
} }
@ -918,6 +919,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (mIsDetectingGesture) { if (mIsDetectingGesture) {
final boolean onValidArea = mGestureStrokeWithPreviewPoints.addPointOnKeyboard( final boolean onValidArea = mGestureStrokeWithPreviewPoints.addPointOnKeyboard(
x, y, gestureTime, isMajorEvent); x, y, gestureTime, isMajorEvent);
// If the move event goes out from valid batch input area, cancel batch input.
if (!onValidArea) { if (!onValidArea) {
cancelBatchInput(); cancelBatchInput();
return; return;
@ -1196,6 +1198,9 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
@Override @Override
public void cancelTracking() { public void cancelTracking() {
if (isShowingMoreKeysPanel()) {
return;
}
mIsTrackingCanceled = true; mIsTrackingCanceled = true;
} }