Merge remote-tracking branch 'goog/master' into merge

main
satok 2011-04-22 17:44:58 +09:00
commit 5b2d4d5b67
1 changed files with 4 additions and 2 deletions

View File

@ -459,7 +459,8 @@ public class PointerTracker {
keyboard.updateSpacebarPreviewIcon(diff);
// Display spacebar slide language switcher.
showKeyPreview(keyIndex);
queue.releaseAllPointersExcept(this, eventTime, true);
if (queue != null)
queue.releaseAllPointersExcept(this, eventTime, true);
}
}
}
@ -551,7 +552,8 @@ public class PointerTracker {
public void onLongPressed(PointerTrackerQueue queue) {
mKeyAlreadyProcessed = true;
queue.remove(this);
if (queue != null)
queue.remove(this);
}
public void onCancelEvent(int x, int y, long eventTime, PointerTrackerQueue queue) {