diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-07-30 17:17:12 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-30 17:17:12 +0000 |
| commit | 198e069ffef2bb2f16f1f19ea43e6b97c1db13fd (patch) | |
| tree | bb0aab06b4b8671dfd0f76f53e5e97c218484a64 /java/src/com/android/inputmethod/latin/inputlogic | |
| parent | a4dbe713e0485620105ce3e9f3fd1baf8b2b6135 (diff) | |
| parent | 46f56262ed3fecf6cbe7341dc903636b30b23f2c (diff) | |
| download | latinime-198e069ffef2bb2f16f1f19ea43e6b97c1db13fd.tar.gz latinime-198e069ffef2bb2f16f1f19ea43e6b97c1db13fd.tar.xz latinime-198e069ffef2bb2f16f1f19ea43e6b97c1db13fd.zip | |
am 46f56262: am 99e13e48: am bf2a3210: Merge "[HW6] Split processing and applying the event." into lmp-dev
* commit '46f56262ed3fecf6cbe7341dc903636b30b23f2c':
[HW6] Split processing and applying the event.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 6 |
1 files changed, 4 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 74d879919..bb2d304a6 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -762,7 +762,8 @@ public final class InputLogic { resetComposingState(false /* alsoResetLastComposedWord */); } if (isComposingWord) { - mWordComposer.processEvent(inputTransaction.mEvent); + final Event processedEvent = mWordComposer.processEvent(inputTransaction.mEvent); + mWordComposer.applyProcessedEvent(processedEvent); // If it's the first letter, make note of auto-caps state if (mWordComposer.isSingleLetter()) { mWordComposer.setCapitalizedModeAtStartComposingTime(inputTransaction.mShiftState); @@ -933,7 +934,8 @@ public final class InputLogic { mDictionaryFacilitator.removeWordFromPersonalizedDicts(rejectedSuggestion); } } else { - mWordComposer.processEvent(inputTransaction.mEvent); + final Event processedEvent = mWordComposer.processEvent(inputTransaction.mEvent); + mWordComposer.applyProcessedEvent(processedEvent); } if (mWordComposer.isComposingWord()) { mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1); |