am c66a2d1d: am 61155c70: am 9d423536: Merge "Don\'t cancel long press timer too early" into jb-mr1-dev

* commit 'c66a2d1da69de796a2a7acb5dd6903cb5668585c':
  Don't cancel long press timer too early
This commit is contained in:
Tadashi G. Takaoka 2012-10-11 00:52:05 -07:00 committed by Android Git Automerger
commit c1f2c3a646
2 changed files with 2 additions and 4 deletions

View File

@ -836,13 +836,11 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
// Register move event on gesture tracker.
onGestureMoveEvent(x, y, eventTime, true /* isMajorEvent */, key);
if (sInGesture) {
mTimerProxy.cancelLongPressTimer();
mCurrentKey = null;
setReleasedKeyGraphics(oldKey);
return;
}
if (mGestureStrokeWithPreviewPoints.hasDetectedFastMove()) {
mTimerProxy.cancelLongPressTimer();
}
}
if (key != null) {

View File

@ -243,7 +243,7 @@ public class GestureStroke {
mLastMajorEventY = y;
}
public final boolean hasDetectedFastMove() {
private final boolean hasDetectedFastMove() {
return mDetectFastMoveTime > 0;
}