am 68f46d9c: Merge "Don\'t upcase suggestions when resuming on an uppercase word"

* commit '68f46d9c2f83a901aa7d591cffacc7462a6cf065':
  Don't upcase suggestions when resuming on an uppercase word
main
Jean Chalard 2014-05-22 04:00:47 +00:00 committed by Android Git Automerger
commit 5af4f2660e
1 changed files with 4 additions and 1 deletions

View File

@ -111,7 +111,10 @@ public final class Suggest {
additionalFeaturesOptions, SESSION_TYPING, rawSuggestions);
final boolean isFirstCharCapitalized = wordComposer.isFirstCharCapitalized();
final boolean isAllUpperCase = wordComposer.isAllUpperCase();
// If resumed, then we don't want to upcase everything: resuming on a fully-capitalized
// words is rarely done to switch to another fully-capitalized word, but usually to a
// normal, non-capitalized suggestion.
final boolean isAllUpperCase = wordComposer.isAllUpperCase() && !wordComposer.isResumed();
final String firstSuggestion;
final String whitelistedWord;
if (suggestionResults.isEmpty()) {