Merge "Refactoring (A11)"

1 files changed, 9 insertions, 5 deletions

diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 67c03f626..fb9de5062 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -239,15 +239,19 @@ public class Suggest implements Dictionary.WordCallback {
         if (wordComposer.size() <= 1 && isCorrectionEnabled) {
             // At first character typed, search only the bigrams
             if (!TextUtils.isEmpty(prevWordForBigram)) {
+                final CharSequence lowerPrevWord;
                 if (StringUtils.hasUpperCase(prevWordForBigram)) {
                     // TODO: Must pay attention to locale when changing case.
-                    final CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase();
-                    for (final Dictionary dictionary : mBigramDictionaries.values()) {
-                        dictionary.getBigrams(wordComposer, lowerPrevWord, this);
-                    }
+                    lowerPrevWord = prevWordForBigram.toString().toLowerCase();
+                } else {
+                    lowerPrevWord = null;
                 }
-                for (final Dictionary dictionary : mBigramDictionaries.values()) {
+                for (final String key : mBigramDictionaries.keySet()) {
+                    final Dictionary dictionary = mBigramDictionaries.get(key);
                     dictionary.getBigrams(wordComposer, prevWordForBigram, this);
+                    if (null != lowerPrevWord) {
+                        dictionary.getBigrams(wordComposer, lowerPrevWord, this);
+                    }
                 }
             }
         } else if (wordComposer.size() > 1) {