commit e42ec2a6ac64dc82828d6bd5153fae19e318bbfd
author Jean Chalard <jchalard@google.com> Fri Apr 20 00:11:20 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 20 00:11:20 2012 -0700
tree 6b962b5d777eaedab231c1e873cda3ac2d8d1e0a
parent 6bfd5f631908c4afd893c9b25b353e5e16c5fc0c
parent 29a1fc0f6b18dd41e7810ee720041f7c7557eb4f

Merge "Don't allow cancelling manual pick."

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 861c23b..e1978fc 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1848,6 +1848,8 @@
         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;