diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-07-04 19:21:16 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-07-04 19:21:16 +0900 |
| commit | 12bbd2cd5e35b070185da31126f387874081fdf8 (patch) | |
| tree | 6d3651e091ded51f075aa14c0fe66670515b847c /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | c68b37964b083015967ce290991ad69d29a4055d (diff) | |
| parent | ac3bd96192e12cbd4c943382d3bf74e266ac1764 (diff) | |
| download | latinime-12bbd2cd5e35b070185da31126f387874081fdf8.tar.gz latinime-12bbd2cd5e35b070185da31126f387874081fdf8.tar.xz latinime-12bbd2cd5e35b070185da31126f387874081fdf8.zip | |
Merge remote-tracking branch 'goog/master' into mergescript
Conflicts:
java/src/com/android/inputmethod/latin/SuggestedWords.java
Change-Id: I1ce6cd0846cb93a5c9bb2d9c3638d59f90232c26
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 8a5fc495e..6e3540485 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -63,6 +63,7 @@ import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy; import com.android.inputmethod.compat.CompatUtils; import com.android.inputmethod.compat.InputMethodManagerCompatWrapper; import com.android.inputmethod.compat.SuggestionSpanUtils; +import com.android.inputmethod.keyboard.KeyDetector; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardActionListener; import com.android.inputmethod.keyboard.KeyboardId; @@ -1508,8 +1509,18 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen clearSuggestions(); } if (isComposingWord) { - mWordComposer.add( - primaryCode, x, y, mKeyboardSwitcher.getKeyboardView().getKeyDetector()); + final int keyX, keyY; + if (KeyboardActionListener.Adapter.isInvalidCoordinate(x) + || KeyboardActionListener.Adapter.isInvalidCoordinate(y)) { + keyX = x; + keyY = y; + } else { + final KeyDetector keyDetector = + mKeyboardSwitcher.getKeyboardView().getKeyDetector(); + keyX = keyDetector.getTouchX(x); + keyY = keyDetector.getTouchY(y); + } + mWordComposer.add(primaryCode, keyX, keyY); // If it's the first letter, make note of auto-caps state if (mWordComposer.size() == 1) { mWordComposer.setAutoCapitalized( |