aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-04-20 00:11:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-20 00:11:20 -0700
commite42ec2a6ac64dc82828d6bd5153fae19e318bbfd (patch)
tree6b962b5d777eaedab231c1e873cda3ac2d8d1e0a /java/src/com/android/inputmethod
parent6bfd5f631908c4afd893c9b25b353e5e16c5fc0c (diff)
parent29a1fc0f6b18dd41e7810ee720041f7c7557eb4f (diff)
downloadlatinime-e42ec2a6ac64dc82828d6bd5153fae19e318bbfd.tar.gz
latinime-e42ec2a6ac64dc82828d6bd5153fae19e318bbfd.tar.xz
latinime-e42ec2a6ac64dc82828d6bd5153fae19e318bbfd.zip
Merge "Don't allow cancelling manual pick."
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 861c23b04..e1978fca1 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1848,6 +1848,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mExpectingUpdateSelection = true;
commitChosenWord(suggestion, LastComposedWord.COMMIT_TYPE_MANUAL_PICK,
LastComposedWord.NOT_A_SEPARATOR);
+ // Don't allow cancellation of manual pick
+ mLastComposedWord.deactivate();
// Add the word to the user history dictionary
addToUserHistoryDictionary(suggestion);
mSpaceState = SPACE_STATE_PHANTOM;