diff options
| author |   satok <satok@google.com> | 2012-03-28 18:21:04 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2012-03-28 18:42:30 +0900 |
| commit | 6ba8de2a608dfe4865b0b59a753f2d2abbedeeff (patch) | |
| tree | 8d4e2f90dcbeca665c6e54d491cb41e9169042d1 /java/src/com/android/inputmethod/latin/WordComposer.java | |
| parent | 67094f5bdece00994f70c6f1fa9a6ff7b8f3c3c1 (diff) | |
| download | latinime-6ba8de2a608dfe4865b0b59a753f2d2abbedeeff.tar.gz latinime-6ba8de2a608dfe4865b0b59a753f2d2abbedeeff.tar.xz latinime-6ba8de2a608dfe4865b0b59a753f2d2abbedeeff.zip | |
Good bye the proximity logic in Java code
Bug: 4343280
Change-Id: I82f7d08703647a3492ce6e2d3b741146df58927e
Diffstat (limited to 'java/src/com/android/inputmethod/latin/WordComposer.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/WordComposer.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java index ac9304548..555a49ef4 100644 --- a/java/src/com/android/inputmethod/latin/WordComposer.java +++ b/java/src/com/android/inputmethod/latin/WordComposer.java @@ -127,7 +127,6 @@ public class WordComposer { // TODO: remove input keyDetector public void add(int primaryCode, int x, int y, KeyDetector keyDetector) { - final int[] codes; final int keyX; final int keyY; if (null == keyDetector @@ -135,16 +134,13 @@ public class WordComposer { || y == KeyboardActionListener.SUGGESTION_STRIP_COORDINATE || x == KeyboardActionListener.NOT_A_TOUCH_COORDINATE || y == KeyboardActionListener.NOT_A_TOUCH_COORDINATE) { - codes = new int[] { primaryCode }; keyX = x; keyY = y; } else { - // TODO: Pass an integer instead of an integer array - codes = new int[] { primaryCode }; keyX = keyDetector.getTouchX(x); keyY = keyDetector.getTouchY(y); } - add(primaryCode, codes, keyX, keyY); + add(primaryCode, keyX, keyY); } /** @@ -152,7 +148,7 @@ public class WordComposer { * the array containing unicode for adjacent keys, sorted by reducing probability/proximity. * @param codes the array of unicode values */ - private void add(int primaryCode, int[] codes, int keyX, int keyY) { + private void add(int primaryCode, int keyX, int keyY) { final int newIndex = size(); mTypedWord.appendCodePoint(primaryCode); refreshSize(); @@ -181,13 +177,11 @@ public class WordComposer { if (key.mCode == codePoint) { final int x = key.mX + key.mWidth / 2; final int y = key.mY + key.mHeight / 2; - // TODO: Pass an integer instead of an integer array - add(codePoint, new int[] { key.mCode }, x, y); + add(codePoint, x, y); return; } } - add(codePoint, new int[] { codePoint }, - WordComposer.NOT_A_COORDINATE, WordComposer.NOT_A_COORDINATE); + add(codePoint, WordComposer.NOT_A_COORDINATE, WordComposer.NOT_A_COORDINATE); } /** |