1 files changed, 21 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyDetector.java b/java/src/com/android/inputmethod/keyboard/KeyDetector.java
index f5686dcda..0a91284d0 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyDetector.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyDetector.java
@@ -21,6 +21,7 @@ import com.android.inputmethod.latin.Constants;
 
 public class KeyDetector {
     private final int mKeyHysteresisDistanceSquared;
+    private final int mKeyHysteresisDistanceForSlidingModifierSquared;
 
     private Keyboard mKeyboard;
     private int mCorrectionX;
@@ -30,10 +31,24 @@ public class KeyDetector {
      * This class handles key detection.
      *
      * @param keyHysteresisDistance if the pointer movement distance is smaller than this, the
-     * movement will not been handled as meaningful movement. The unit is pixel.
+     * movement will not be handled as meaningful movement. The unit is pixel.
      */
     public KeyDetector(float keyHysteresisDistance) {
+        this(keyHysteresisDistance, keyHysteresisDistance);
+    }
+
+    /**
+     * This class handles key detection.
+     *
+     * @param keyHysteresisDistance if the pointer movement distance is smaller than this, the
+     * movement will not be handled as meaningful movement. The unit is pixel.
+     * @param keyHysteresisDistanceForSlidingModifier the same parameter for sliding input that
+     * starts from a modifier key such as shift and symbols key.
+     */
+    public KeyDetector(float keyHysteresisDistance, float keyHysteresisDistanceForSlidingModifier) {
         mKeyHysteresisDistanceSquared = (int)(keyHysteresisDistance * keyHysteresisDistance);
+        mKeyHysteresisDistanceForSlidingModifierSquared = (int)(
+                keyHysteresisDistanceForSlidingModifier * keyHysteresisDistanceForSlidingModifier);
     }
 
     public void setKeyboard(Keyboard keyboard, float correctionX, float correctionY) {
@@ -45,8 +60,9 @@ public class KeyDetector {
         mKeyboard = keyboard;
     }
 
-    public int getKeyHysteresisDistanceSquared() {
-        return mKeyHysteresisDistanceSquared;
+    public int getKeyHysteresisDistanceSquared(boolean isSlidingFromModifier) {
+        return isSlidingFromModifier
+                ? mKeyHysteresisDistanceForSlidingModifierSquared : mKeyHysteresisDistanceSquared;
     }
 
     public int getTouchX(int x) {
@@ -102,7 +118,7 @@ public class KeyDetector {
     }
 
     public static String printableCode(Key key) {
-        return key != null ? Keyboard.printableCode(key.mCode) : "none";
+        return key != null ? Constants.printableCode(key.mCode) : "none";
     }
 
     public static String printableCodes(int[] codes) {
@@ -111,7 +127,7 @@ public class KeyDetector {
         for (final int code : codes) {
             if (code == Constants.NOT_A_CODE) break;
             if (addDelimiter) sb.append(", ");
-            sb.append(Keyboard.printableCode(code));
+            sb.append(Constants.printableCode(code));
             addDelimiter = true;
         }
         return "[" + sb + "]";