diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-07-30 02:45:59 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 16:04:26 +0000 |
| commit | bf2a32100568a01d25edb56d3d9d46b5f5d2c0eb (patch) | |
| tree | c532009e253df2ab36db3168cfb8e0c705b6c8f7 /java/src/com/android/inputmethod/latin/inputlogic | |
| parent | 0b1fa0c1c7572893365c019780357a817158e5ea (diff) | |
| parent | 7196566d4f2048a4160acc6271ccb26c73d6fcd6 (diff) | |
| download | latinime-bf2a32100568a01d25edb56d3d9d46b5f5d2c0eb.tar.gz latinime-bf2a32100568a01d25edb56d3d9d46b5f5d2c0eb.tar.xz latinime-bf2a32100568a01d25edb56d3d9d46b5f5d2c0eb.zip | |
Merge "[HW6] Split processing and applying the event." into lmp-dev
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); |