commit 25b5e627d8b269db165f5edf196def38a664c92c
author Tadashi G. Takaoka <takaoka@google.com> Fri Apr 20 00:41:44 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 20 00:41:44 2012 -0700
tree 26468c969706bb7722f0a1410e3cfe2650a559c0
parent e42ec2a6ac64dc82828d6bd5153fae19e318bbfd
parent 9fa0a2e83f1daf2864d8caa24b8c507ad3c28e87

Merge "Modularize keyboard XML files"

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;