diff options
| -rw-r--r-- | java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 5 | ||||
| -rw-r--r-- | native/jni/src/defines.h | 2 |
2 files changed, 5 insertions, 2 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) { diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 1969ebae0..22cc4c02b 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -311,7 +311,7 @@ static inline void prof_out(void) { // A special value to mean the first word confidence makes no sense in this case, // e.g. this is not a multi-word suggestion. -#define NOT_A_FIRST_WORD_CONFIDENCE (S_INT_MAX) +#define NOT_A_FIRST_WORD_CONFIDENCE (S_INT_MIN) // How high the confidence needs to be for us to auto-commit. Arbitrary. // This needs to be the same as CONFIDENCE_FOR_AUTO_COMMIT in BinaryDictionary.java #define CONFIDENCE_FOR_AUTO_COMMIT (1000000) |