aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/Suggest.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-05-22 03:57:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-22 03:57:38 +0000
commit68f46d9c2f83a901aa7d591cffacc7462a6cf065 (patch)
tree1add9eed8a77c85229a857e6750e777b7aa427a3 /java/src/com/android/inputmethod/latin/Suggest.java
parent814cf03470c7bbe92af317b79a414734ae713ae0 (diff)
parentdfc38358fcadfcffbdb16a268acceba374fb142b (diff)
downloadlatinime-68f46d9c2f83a901aa7d591cffacc7462a6cf065.tar.gz
latinime-68f46d9c2f83a901aa7d591cffacc7462a6cf065.tar.xz
latinime-68f46d9c2f83a901aa7d591cffacc7462a6cf065.zip
Merge "Don't upcase suggestions when resuming on an uppercase word"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Suggest.java')
-rw-r--r--java/src/com/android/inputmethod/latin/Suggest.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 154872778..43daee4d2 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -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()) {