diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-05-14 11:40:54 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-14 11:40:54 +0000 |
| commit | 05db21949fd29103a60502c235e80f339a5cd9b6 (patch) | |
| tree | 712279404ec470dff240d30905ac7dc0ef9dbb5c /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | |
| parent | 0e40c0ce82078d58cc078a092a913e4ed4fdf326 (diff) | |
| parent | babde55bf843c2262d84580c0139ed6b040bef7e (diff) | |
| download | latinime-05db21949fd29103a60502c235e80f339a5cd9b6.tar.gz latinime-05db21949fd29103a60502c235e80f339a5cd9b6.tar.xz latinime-05db21949fd29103a60502c235e80f339a5cd9b6.zip | |
am babde55b: Merge "Fix a bug where changing languages kills the composition."
* commit 'babde55bf843c2262d84580c0139ed6b040bef7e':
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.java | 4 |
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); } /** |