diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-07-29 13:39:36 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-29 13:39:36 +0000 |
| commit | 97c5945132cee730bac50f38335b325ad3198c28 (patch) | |
| tree | 27d5f767c7bf3a0fa8bad2848b8ed3ba72bc2eb5 /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | |
| parent | 0fbc31034181cb35304eb9662298884b0115e640 (diff) | |
| parent | caf539079d8e02f2f9f4b50a933d3df55c6e85c1 (diff) | |
| download | latinime-97c5945132cee730bac50f38335b325ad3198c28.tar.gz latinime-97c5945132cee730bac50f38335b325ad3198c28.tar.xz latinime-97c5945132cee730bac50f38335b325ad3198c28.zip | |
am caf53907: am 4591869d: am 6c39db9f: Merge "[HW6] Split processing and applying the event." into lmp-dev
* commit 'caf539079d8e02f2f9f4b50a933d3df55c6e85c1':
[HW6] Split processing and applying the event.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java')
| -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); |