From dfc38358fcadfcffbdb16a268acceba374fb142b Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 22 May 2014 11:37:08 +0900
Subject: [PATCH] Don't upcase suggestions when resuming on an uppercase word

Bug: 13917781
Change-Id: I7458d120898a7c8c0bc2db2f6db3578fd1dd1681
---
 java/src/com/android/inputmethod/latin/Suggest.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index e3759a586..3b46d76b5 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -112,7 +112,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()) {