diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-07-30 17:11:32 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-30 17:11:32 +0000 |
| commit | ae5ebb06cdcc89c6ae8c959dda89ca1cd5165fe3 (patch) | |
| tree | 87416a51e4ff862a6882b10b7b61d4c1e454ac2d /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | |
| parent | 06be57772f2fe5e3b92bfa137d90962fc792d258 (diff) | |
| parent | 93114fa05f974fb6955937efe3207e025d5a82c5 (diff) | |
| download | latinime-ae5ebb06cdcc89c6ae8c959dda89ca1cd5165fe3.tar.gz latinime-ae5ebb06cdcc89c6ae8c959dda89ca1cd5165fe3.tar.xz latinime-ae5ebb06cdcc89c6ae8c959dda89ca1cd5165fe3.zip | |
am 93114fa0: am c4f6fc1e: Merge "Revert "[HW6] Split processing and applying the event."" into lmp-dev
* commit '93114fa05f974fb6955937efe3207e025d5a82c5':
Revert "[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, 2 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index bb2d304a6..74d879919 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -762,8 +762,7 @@ public final class InputLogic { resetComposingState(false /* alsoResetLastComposedWord */); } if (isComposingWord) { - final Event processedEvent = mWordComposer.processEvent(inputTransaction.mEvent); - mWordComposer.applyProcessedEvent(processedEvent); + mWordComposer.processEvent(inputTransaction.mEvent); // If it's the first letter, make note of auto-caps state if (mWordComposer.isSingleLetter()) { mWordComposer.setCapitalizedModeAtStartComposingTime(inputTransaction.mShiftState); @@ -934,8 +933,7 @@ public final class InputLogic { mDictionaryFacilitator.removeWordFromPersonalizedDicts(rejectedSuggestion); } } else { - final Event processedEvent = mWordComposer.processEvent(inputTransaction.mEvent); - mWordComposer.applyProcessedEvent(processedEvent); + mWordComposer.processEvent(inputTransaction.mEvent); } if (mWordComposer.isComposingWord()) { mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1); |