am 4da06b9a: Merge "Correctly update the suggestion strip on non-resumable word"

* commit '4da06b9a1957dcd9a937cc64ab17c84061b87ea7':
  Correctly update the suggestion strip on non-resumable word
main
Jean Chalard 2014-03-06 00:56:42 -08:00 committed by Android Git Automerger
commit f845b8d576
1 changed files with 4 additions and 1 deletions

View File

@ -1304,7 +1304,10 @@ public final class InputLogic {
SuggestedWordInfo.NOT_AN_INDEX /* indexOfTouchPointOfSecondWord */, SuggestedWordInfo.NOT_AN_INDEX /* indexOfTouchPointOfSecondWord */,
SuggestedWordInfo.NOT_A_CONFIDENCE /* autoCommitFirstWordConfidence */)); SuggestedWordInfo.NOT_A_CONFIDENCE /* autoCommitFirstWordConfidence */));
} }
if (!isResumableWord(settingsValues, typedWord)) return; if (!isResumableWord(settingsValues, typedWord)) {
mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
return;
}
int i = 0; int i = 0;
for (final SuggestionSpan span : range.getSuggestionSpansAtWord()) { for (final SuggestionSpan span : range.getSuggestionSpansAtWord()) {
for (final String s : span.getSuggestions()) { for (final String s : span.getSuggestions()) {