aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-15 11:27:27 +0900
committerJean Chalard <jchalard@google.com>2014-01-27 18:18:27 +0900
commit969c06072db7f530806a4d0581ce588f01d09dc2 (patch)
treeb286cc64b034ba00c8c2bcb431cd236c433fbb58 /java/src/com/android/inputmethod/latin/LatinIME.java
parent0fd556cecaf4431e349c990c9a0bb1c7ed3a24a2 (diff)
downloadlatinime-969c06072db7f530806a4d0581ce588f01d09dc2.tar.gz
latinime-969c06072db7f530806a4d0581ce588f01d09dc2.tar.xz
latinime-969c06072db7f530806a4d0581ce588f01d09dc2.zip
[IL75] Move the SubtypeSwitcher out of InputLogic.
Bug: 8636060 Change-Id: I2a5da27e73cf378e55bd80ab2054c1ba8b13f6ec
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index f95d77d3d..5d284cd51 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1285,8 +1285,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} else {
codeToSend = codePoint;
}
- mInputLogic.onCodeInput(codeToSend, keyX, keyY, mHandler, mKeyboardSwitcher,
- mSubtypeSwitcher);
+ if (Constants.CODE_SHORTCUT == codePoint) {
+ mSubtypeSwitcher.switchToShortcutIME(this);
+ // Still call the *#onCodeInput methods for readability.
+ }
+ mInputLogic.onCodeInput(codeToSend, keyX, keyY, mHandler, mKeyboardSwitcher);
mKeyboardSwitcher.onCodeInput(codePoint);
}