aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-22 18:44:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-22 18:44:50 -0800
commit05d9fcff2d02775d90e8f5557646eff901941e8a (patch)
tree4883941e180ffff8e06d69f1d2ca67521a21dd15 /java/src/com/android/inputmethod/latin
parent0f06d8801a141d74e8145a60bc65bcafbf8bf1cb (diff)
parenta91dfff5e54f68c4003327eeca47286084c35a2f (diff)
downloadlatinime-05d9fcff2d02775d90e8f5557646eff901941e8a.tar.gz
latinime-05d9fcff2d02775d90e8f5557646eff901941e8a.tar.xz
latinime-05d9fcff2d02775d90e8f5557646eff901941e8a.zip
am a91dfff5: [IL65] Pull up X,Y processing, step 4
* commit 'a91dfff5e54f68c4003327eeca47286084c35a2f': [IL65] Pull up X,Y processing, step 4
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java11
1 files changed, 2 insertions, 9 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 0f40e1365..aca361905 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1247,21 +1247,14 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// Implementation of {@link KeyboardActionListener}.
@Override
public void onCodeInput(final int codePoint, final int x, final int y) {
- final int keyX, keyY;
- final Keyboard keyboard = mKeyboardSwitcher.getKeyboard();
final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
// x and y include some padding, but everything down the line (especially native
// code) needs the coordinates in the keyboard frame.
// TODO: We should reconsider which coordinate system should be used to represent
// keyboard event. Also we should pull this up -- LatinIME has no business doing
// this transformation, it should be done already before calling onCodeInput.
- if (keyboard != null && keyboard.hasProximityCharsCorrection(codePoint)) {
- keyX = mainKeyboardView.getKeyX(x);
- keyY = mainKeyboardView.getKeyY(y);
- } else {
- keyX = Constants.NOT_A_COORDINATE;
- keyY = Constants.NOT_A_COORDINATE;
- }
+ final int keyX = mainKeyboardView.getKeyX(x);
+ final int keyY = mainKeyboardView.getKeyY(y);
mInputLogic.onCodeInput(codePoint, keyX, keyY, mHandler, mKeyboardSwitcher,
mSubtypeSwitcher);
}