diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-07-30 17:11:34 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-30 17:11:34 +0000 |
| commit | 46f56262ed3fecf6cbe7341dc903636b30b23f2c (patch) | |
| tree | 071b95987eaccf3ad13ce0871e0bf29cb6ee7dde /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | |
| parent | 026350a179995ef530a38cde3043d813a55129b1 (diff) | |
| parent | 99e13e485a314615a6523794fbb26eecb6e67a74 (diff) | |
| download | latinime-46f56262ed3fecf6cbe7341dc903636b30b23f2c.tar.gz latinime-46f56262ed3fecf6cbe7341dc903636b30b23f2c.tar.xz latinime-46f56262ed3fecf6cbe7341dc903636b30b23f2c.zip | |
am 99e13e48: am bf2a3210: Merge "[HW6] Split processing and applying the event." into lmp-dev
* commit '99e13e485a314615a6523794fbb26eecb6e67a74':
[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); |