aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-05-14 09:53:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-14 09:53:28 +0000
commit8e38607e5c3416a27b13fccaf29b525071cfeb84 (patch)
tree0cc8b10093b1d8a22c3ccb0aecb82b8198f4982b /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
parent5c39b00bb60089dd815bd71f359fbf2a31f9bce9 (diff)
parent08476dc1076cec7758786141bb86b3a5c46e4e35 (diff)
downloadlatinime-8e38607e5c3416a27b13fccaf29b525071cfeb84.tar.gz
latinime-8e38607e5c3416a27b13fccaf29b525071cfeb84.tar.xz
latinime-8e38607e5c3416a27b13fccaf29b525071cfeb84.zip
am 08476dc1: Merge "Don\'t send empty composing texts."
* commit '08476dc1076cec7758786141bb86b3a5c46e4e35': Don't send empty composing texts.
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, 5 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 8b795b82f..1156c7737 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -936,7 +936,11 @@ public final class InputLogic {
} else {
mWordComposer.processEvent(inputTransaction.mEvent);
}
- mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
+ if (mWordComposer.isComposingWord()) {
+ mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
+ } else {
+ mConnection.commitText("", 1);
+ }
inputTransaction.setRequiresUpdateSuggestions();
} else {
if (mLastComposedWord.canRevertCommit()) {