am ff778fd4: Merge "A small simplification."

* commit 'ff778fd406a7c13a9af9e2c59d45d94b8540017d':
  A small simplification.
This commit is contained in:
Jean Chalard 2012-12-27 22:06:16 -08:00 committed by Android Git Automerger
commit 5bd724ef01

View file

@ -997,9 +997,6 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
final boolean isAutoCorrection = false; final boolean isAutoCorrection = false;
setSuggestionStrip(suggestedWords, isAutoCorrection); setSuggestionStrip(suggestedWords, isAutoCorrection);
setAutoCorrectionIndicator(isAutoCorrection); setAutoCorrectionIndicator(isAutoCorrection);
// TODO: is this the right thing to do? What should we auto-correct to in
// this case? This says to keep whatever the user typed.
mWordComposer.setAutoCorrection(mWordComposer.getTypedWord());
setSuggestionStripShown(true); setSuggestionStripShown(true);
if (ProductionFlag.IS_EXPERIMENTAL) { if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.latinIME_onDisplayCompletions(applicationSpecifiedCompletions); ResearchLogger.latinIME_onDisplayCompletions(applicationSpecifiedCompletions);
@ -1989,7 +1986,6 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
if (mWordComposer.isComposingWord()) { if (mWordComposer.isComposingWord()) {
Log.w(TAG, "Called updateSuggestionsOrPredictions but suggestions were not " Log.w(TAG, "Called updateSuggestionsOrPredictions but suggestions were not "
+ "requested!"); + "requested!");
mWordComposer.setAutoCorrection(mWordComposer.getTypedWord());
} }
return; return;
} }