Do not display punctuation suggestions when bigrams are on.

Bug: 6310401
Change-Id: I9d31c48e287aceedaf2f4c5129031ddb31402451
This commit is contained in:
Jean Chalard 2012-06-15 03:52:48 +09:00
parent 3baa7767e8
commit d5b765b3bb
2 changed files with 7 additions and 3 deletions

View file

@ -2053,12 +2053,16 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// showSuggestions will retrieve the word near the cursor, we don't want that here) // showSuggestions will retrieve the word near the cursor, we don't want that here)
showSuggestions(suggestedWords, ""); showSuggestions(suggestedWords, "");
} else { } else {
if (!isShowingPunctuationList()) setPunctuationSuggestions(); clearSuggestions();
} }
} }
public void setPunctuationSuggestions() { public void setPunctuationSuggestions() {
setSuggestions(mSettingsValues.mSuggestPuncList, false); if (mSettingsValues.mBigramPredictionEnabled) {
clearSuggestions();
} else {
setSuggestions(mSettingsValues.mSuggestPuncList, false);
}
setAutoCorrectionIndicator(false); setAutoCorrectionIndicator(false);
setSuggestionStripShown(isSuggestionsStripVisible()); setSuggestionStripShown(isSuggestionsStripVisible());
} }

View file

@ -670,7 +670,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
} }
public void setSuggestions(SuggestedWords suggestedWords) { public void setSuggestions(SuggestedWords suggestedWords) {
if (suggestedWords == null || suggestedWords.size() == 0) if (suggestedWords == null)
return; return;
clear(); clear();