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

am 2b2c0b57: Merge "Use the WordComposer to check if we are composing a word"

Browse source 
* commit '2b2c0b574c602fde3bc9482c157e8ead02be358a':
  Use the WordComposer to check if we are composing a word
This commit is contained in:
Jean Chalard 2011-12-16 03:49:13 -08:00 committed by Android Git Automerger
commit 5da3e3251c
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -863,7 +863,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// newly inserted punctuation.
mSpaceState = SPACE_STATE_NONE;
}
if (((mWordComposer.size() > 0 && mHasUncommittedTypedChars)
if (((mWordComposer.isComposingWord())
|| mVoiceProxy.isVoiceInputHighlighted())
&& (selectionChanged || candidatesCleared)) {
mWordComposer.reset();
@ -875,7 +875,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
}
mComposingStateManager.onFinishComposingText();
mVoiceProxy.setVoiceInputHighlighted(false);
} else if (!mHasUncommittedTypedChars) {
} else if (!mWordComposer.isComposingWord()) {
updateSuggestions();
}
}
@ -1076,7 +1076,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
}
public void commitTyped(final InputConnection ic) {
if (!mHasUncommittedTypedChars) return;
if (!mWordComposer.isComposingWord()) return;
mHasUncommittedTypedChars = false;
final CharSequence typedWord = mWordComposer.getTypedWord();
mWordComposer.onCommitWord();
@ -1352,18 +1352,19 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
return;
}
if (mHasUncommittedTypedChars) {
if (mWordComposer.isComposingWord()) {
final int length = mWordComposer.size();
if (length > 0) {
mWordComposer.deleteLast();
ic.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
if (mWordComposer.size() == 0) {
// If we have deleted the last remaining character of a word, then we are not
// isComposingWord() any more.
if (!mWordComposer.isComposingWord()) {
mHasUncommittedTypedChars = false;
// Remaining size equals zero means we just erased the last character of the
// word, so we can show bigrams.
// Not composing word any more, so we can show bigrams.
mHandler.postUpdateBigramPredictions();
} else {
// length > 1, so we still have letters to deduce a suggestion from.
// Still composing a word, so we still have letters to deduce a suggestion from.
mHandler.postUpdateSuggestions();
}
} else {
@ -1452,7 +1453,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
if (null != ic) removeTrailingSpaceWhileInBatchEdit(ic);
}
boolean isComposingWord = mHasUncommittedTypedChars;
boolean isComposingWord = mWordComposer.isComposingWord();
int code = primaryCode;
if ((isAlphabet(code) || mSettingsValues.isSymbolExcludedFromWordSeparators(code))
&& isSuggestionsRequested() && !isCursorTouchingWord()) {
@ -1535,7 +1536,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// Reset the saved word in all cases. If this separator causes an autocorrection,
// it will overwrite this null with the actual word we need to save.
mWordSavedForAutoCorrectCancellation = null;
if (mHasUncommittedTypedChars) {
if (mWordComposer.isComposingWord()) {
// In certain languages where single quote is a separator, it's better
// not to auto correct, but accept the typed word. For instance,
// in Italian dov' should not be expanded to dove' because the elision
@ -1710,7 +1711,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
mHandler.cancelUpdateSuggestions();
mHandler.cancelUpdateBigramPredictions();
if (!mHasUncommittedTypedChars) {
if (!mWordComposer.isComposingWord()) {
setPunctuationSuggestions();
return;
}
@ -1885,11 +1886,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
}
return;
}
if (!mHasUncommittedTypedChars) {
// If we are not composing a word, then it was a suggestion inferred from
// context - no user input. We should reset the word composer.
mWordComposer.reset();
}
mExpectingUpdateSelection = true;
commitBestWord(suggestion);
// Add the word to the auto dictionary if it's not a known word
@ -1899,8 +1895,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} else {
addToOnlyBigramDictionary(suggestion, 1);
}
// TODO: the following is fishy, because if !mHasUncommittedTypedChars we are
// going to log an empty string
// TODO: the following is fishy, because it seems there may be cases where we are not
// composing a word at all. Maybe throw an exception if !mWordComposer.isComposingWord() ?
LatinImeLogger.logOnManualSuggestion(mWordComposer.getTypedWord().toString(),
suggestion.toString(), index, suggestions.mWords);
// Follow it with a space

4
java/src/com/android/inputmethod/latin/WordComposer.java
View file

@ -120,6 +120,10 @@ public class WordComposer {
return mCurrentWord.mTypedWord.length();
}
public final boolean isComposingWord() {
return size() > 0;
}
/**
* Returns the codes at a particular position in the word.
* @param index the position in the word