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

Merge "Straighten an if-else-if blocks into if-return blocks"

main
Tadashi G. Takaoka 2012-10-31 21:23:35 -07:00 committed by Android (Google) Code Review
parent 522a22c87b a232930d9c
commit 0c8a08c141
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1167,7 +1167,11 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
final Key curKey = mCurrentKey;
if (newKey == curKey) {
return false;
} else if (curKey != null) {
}
if (curKey == null /* && newKey != null */) {
return true;
}
// Here curKey points to the different key from newKey.
final int keyHysteresisDistanceSquared = mKeyDetector.getKeyHysteresisDistanceSquared(
mIsInSlidingKeyInputFromModifier);
final int distanceFromKeyEdgeSquared = curKey.squaredDistanceToEdge(x, y);
@ -1176,8 +1180,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
final float distanceToEdgeRatio = (float)Math.sqrt(distanceFromKeyEdgeSquared)
/ mKeyboard.mMostCommonKeyWidth;
Log.d(TAG, String.format("[%d] isMajorEnoughMoveToBeOnNewKey:"
+" %.2f key width from key edge",
mPointerId, distanceToEdgeRatio));
+" %.2f key width from key edge", mPointerId, distanceToEdgeRatio));
}
return true;
}
@ -1196,9 +1199,6 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
return true;
}
return false;
} else { // curKey == null && newKey != null
return true;
}
}
private void startLongPressTimer(final Key key) {