diff options
| author |   satok <satok@google.com> | 2012-03-18 22:01:50 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-03-18 22:01:50 -0700 |
| commit | f9c2773b093213b9fc5495b78ab4a6b1a2009050 (patch) | |
| tree | 4a711cff979605af1eaa0a68d3b599a391645ebe /java/src | |
| parent | 9ffb94fa1318f354692fab7abf4775fa14397a96 (diff) | |
| parent | d6d0f6976ccb04570884b188175213bad2e5da61 (diff) | |
| download | latinime-f9c2773b093213b9fc5495b78ab4a6b1a2009050.tar.gz latinime-f9c2773b093213b9fc5495b78ab4a6b1a2009050.tar.xz latinime-f9c2773b093213b9fc5495b78ab4a6b1a2009050.zip | |
Merge "Make the primary character stable"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyDetector.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyDetector.java b/java/src/com/android/inputmethod/keyboard/KeyDetector.java index d342c6df0..c2ad56d9f 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyDetector.java +++ b/java/src/com/android/inputmethod/keyboard/KeyDetector.java @@ -265,9 +265,9 @@ public class KeyDetector { for (final Key key: mKeyboard.getNearestKeys(touchX, touchY)) { final boolean isOnKey = key.isOnKey(touchX, touchY); final int distance = key.squaredDistanceToEdge(touchX, touchY); - // TODO: need to take care of hitbox overlaps + // To take care of hitbox overlaps, we compare mCode here too. if (primaryKey == null || distance < minDistance - || (distance == minDistance && isOnKey)) { + || (distance == minDistance && isOnKey && key.mCode > primaryKey.mCode)) { minDistance = distance; primaryKey = key; } |