aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-05-14 11:36:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-14 11:36:43 +0000
commitbabde55bf843c2262d84580c0139ed6b040bef7e (patch)
tree712279404ec470dff240d30905ac7dc0ef9dbb5c /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
parent32bdf9f3446d567f05bc49281a4ec43d4a19b2bf (diff)
parent5ce39dfa782031fd53af167c0fd9a9bc63d21149 (diff)
downloadlatinime-babde55bf843c2262d84580c0139ed6b040bef7e.tar.gz
latinime-babde55bf843c2262d84580c0139ed6b040bef7e.tar.xz
latinime-babde55bf843c2262d84580c0139ed6b040bef7e.zip
Merge "Fix a bug where changing languages kills the composition."
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java')
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 1156c7737..ea58abc14 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -127,7 +127,7 @@ public final class InputLogic {
public void startInput(final boolean restarting, final EditorInfo editorInfo,
final String combiningSpec) {
mEnteredText = null;
- mWordComposer.restart(combiningSpec);
+ mWordComposer.restartCombining(combiningSpec);
resetComposingState(true /* alsoResetLastComposedWord */);
mDeleteCount = 0;
mSpaceState = SpaceState.NONE;
@@ -150,7 +150,7 @@ public final class InputLogic {
* @param combiningSpec the spec string for the combining rules
*/
public void onSubtypeChanged(final String combiningSpec) {
- mWordComposer.restart(combiningSpec);
+ mWordComposer.restartCombining(combiningSpec);
}
/**