nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am c4880486: Merge "Check isEligibleForAutoCommit when batch input is ended." 

* commit 'c48804863491d35d3505e13eabdf9d35499c7450':
  Check isEligibleForAutoCommit when batch input is ended.
main
Keisuke Kuroyanagi 2014-02-04 19:37:20 -08:00 committed by Android Git Automerger
parent f34b36b420 c488048634
commit 149ac79205
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
View File

@ -1616,7 +1616,10 @@ public final class InputLogic {
if (SpaceState.PHANTOM == mSpaceState) { if (SpaceState.PHANTOM == mSpaceState) {
promotePhantomSpace(settingsValues); 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 // Find the last space
final int indexOfLastSpace = batchInputText.lastIndexOf(Constants.CODE_SPACE) + 1; final int indexOfLastSpace = batchInputText.lastIndexOf(Constants.CODE_SPACE) + 1;
if (0 != indexOfLastSpace) { if (0 != indexOfLastSpace) {

2
native/jni/src/defines.h
View File

@ -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, // A special value to mean the first word confidence makes no sense in this case,
// e.g. this is not a multi-word suggestion. // 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. // 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 // This needs to be the same as CONFIDENCE_FOR_AUTO_COMMIT in BinaryDictionary.java
#define CONFIDENCE_FOR_AUTO_COMMIT (1000000) #define CONFIDENCE_FOR_AUTO_COMMIT (1000000)