aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2014-07-30 17:17:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-30 17:17:09 +0000
commit863d8daa967eb812a9f702cdcc25a13d91e32e8a (patch)
tree05e2931758cf1597e2b0712300357e3f985d9f54 /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
parent849164f223610daf5421cf647336363bd070878b (diff)
parentae5ebb06cdcc89c6ae8c959dda89ca1cd5165fe3 (diff)
downloadlatinime-863d8daa967eb812a9f702cdcc25a13d91e32e8a.tar.gz
latinime-863d8daa967eb812a9f702cdcc25a13d91e32e8a.tar.xz
latinime-863d8daa967eb812a9f702cdcc25a13d91e32e8a.zip
am ae5ebb06: am 93114fa0: am c4f6fc1e: Merge "Revert "[HW6] Split processing and applying the event."" into lmp-dev
* commit 'ae5ebb06cdcc89c6ae8c959dda89ca1cd5165fe3': 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.java6
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);