Merge "Don't allow cancelling manual pick."

2012-04-20 00:11:20 -07:00 · 2012-04-20 00:11:20 -07:00 · e42ec2a6ac
commit e42ec2a6ac
parent 6bfd5f6319 29a1fc0f6b
1 changed files with 2 additions and 0 deletions
--- 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;