aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-02-04 19:37:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-04 19:37:20 -0800
commit149ac7920544d48265df51aed1da2934092ba0ac (patch)
treeb9559c67f470c10601652a3b9c512779e5872b39 /java
parentf34b36b420054f29e68f3bf1c58382d52b3bad60 (diff)
parentc48804863491d35d3505e13eabdf9d35499c7450 (diff)
downloadlatinime-149ac7920544d48265df51aed1da2934092ba0ac.tar.gz
latinime-149ac7920544d48265df51aed1da2934092ba0ac.tar.xz
latinime-149ac7920544d48265df51aed1da2934092ba0ac.zip
am c4880486: Merge "Check isEligibleForAutoCommit when batch input is ended."
* commit 'c48804863491d35d3505e13eabdf9d35499c7450': Check isEligibleForAutoCommit when batch input is ended.
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index f53183f37..a994a43af 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -1616,7 +1616,10 @@ public final class InputLogic {
if (SpaceState.PHANTOM == mSpaceState) {
promotePhantomSpace(settingsValues);
}
- if (settingsValues.mPhraseGestureEnabled) {
+ final SuggestedWordInfo autoCommitCandidate = mSuggestedWords.getAutoCommitCandidate();
+ // Commit except the last word for phrase gesture if the top suggestion is eligible for auto
+ // commit.
+ if (settingsValues.mPhraseGestureEnabled && null != autoCommitCandidate) {
// Find the last space
final int indexOfLastSpace = batchInputText.lastIndexOf(Constants.CODE_SPACE) + 1;
if (0 != indexOfLastSpace) {