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

Change-Id: If3eede1257658f27384e3efc72586fabbed19f7b

java/src/com/android/inputmethod/keyboard/PointerTracker.java

@@ -1165,7 +1165,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);
@@ -1174,8 +1178,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;
         }
@@ -1194,9 +1197,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) {