am af9fe5c5: Fix a bug where the user typed word would not be passed.

* commit 'af9fe5c5fcad1db22f605e0568c9a77cef178d22':
  Fix a bug where the user typed word would not be passed.
This commit is contained in:
Jean Chalard 2012-01-19 22:53:56 -08:00 committed by Android Git Automerger
commit 67ab8ba29d

View file

@ -1881,6 +1881,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
return; return;
} }
// We need to log before we commit, because the word composer will store away the user
// typed word.
LatinImeLogger.logOnManualSuggestion(mWordComposer.getTypedWord().toString(),
suggestion.toString(), index, suggestions.mWords);
mExpectingUpdateSelection = true; mExpectingUpdateSelection = true;
commitChosenWord(suggestion, WordComposer.COMMIT_TYPE_MANUAL_PICK); commitChosenWord(suggestion, WordComposer.COMMIT_TYPE_MANUAL_PICK);
// Add the word to the auto dictionary if it's not a known word // Add the word to the auto dictionary if it's not a known word
@ -1890,10 +1894,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} else { } else {
addToOnlyBigramDictionary(suggestion, 1); addToOnlyBigramDictionary(suggestion, 1);
} }
// 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 // Follow it with a space
if (mInputAttributes.mInsertSpaceOnPickSuggestionManually) { if (mInputAttributes.mInsertSpaceOnPickSuggestionManually) {
sendMagicSpace(); sendMagicSpace();