aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-02-22 00:29:23 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-22 00:29:23 -0800
commit80c25df49dacbbd3a8baf2fda075dcdb9a8b49cf (patch)
tree56e191493865db1d4770eafb8784dfb4000f124d /java/src/com/android
parent8db74d0fae165ae5677fb9f7b2b631926eca9cc5 (diff)
parent32f0af1fc48f67907f0e731e18359f29e2b1df14 (diff)
downloadlatinime-80c25df49dacbbd3a8baf2fda075dcdb9a8b49cf.tar.gz
latinime-80c25df49dacbbd3a8baf2fda075dcdb9a8b49cf.tar.xz
latinime-80c25df49dacbbd3a8baf2fda075dcdb9a8b49cf.zip
Merge "Implement cancelling a manual pick (A4)"
Diffstat (limited to 'java/src/com/android')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index c70f5f9ef..1424e63f0 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2198,8 +2198,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
ic.deleteSurroundingText(cancelLength + separatorLength, 0);
if (0 == separatorLength || mLastComposedWord.didCommitTypedWord()) {
// This is the case when we cancel a manual pick.
- // TODO: implement this
// We should restart suggestion on the word right away.
+ mWordComposer.resumeSuggestionOnLastComposedWord(mLastComposedWord);
+ mComposingStateManager.onStartComposingText();
+ ic.setComposingText(originallyTypedWord, 1);
} else {
ic.commitText(originallyTypedWord, 1);
// Re-insert the separator