commit d8afa2fbe13adf9f512fd294056a884a0edb0573
author Jean Chalard <jchalard@google.com> Wed Jul 11 16:56:25 2012 +0900
committer Jean Chalard <jchalard@google.com> Thu Jul 12 14:30:33 2012 +0900
tree 791bb509a59fe8fcc1f1f1fb5b80bd05ac5cd515
parent 3b57631b60c696d407a73e7594f6ab2418932229

Remove the ultimate code duplication (A111)

Change-Id: I7c76613df8f148feb02765f187db3ca6dc577977

java/src/com/android/inputmethod/latin/Suggest.java

diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index bbd415f..38094a5 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -192,20 +192,11 @@
         } else {
             wordComposerForLookup = wordComposer;
         }
-        if (wordComposerForLookup.size() <= 1) {
-            // At first character typed, search only the bigrams
-            for (final String key : mDictionaries.keySet()) {
-                final Dictionary dictionary = mDictionaries.get(key);
-                suggestionsSet.addAll(dictionary.getSuggestions(
-                        wordComposerForLookup, prevWordForBigram, proximityInfo));
-            }
-        } else {
-            // At second character typed, search the unigrams (scores being affected by bigrams)
-            for (final String key : mDictionaries.keySet()) {
-                final Dictionary dictionary = mDictionaries.get(key);
-                suggestionsSet.addAll(dictionary.getSuggestions(
-                        wordComposerForLookup, prevWordForBigram, proximityInfo));
-            }
+
+        for (final String key : mDictionaries.keySet()) {
+            final Dictionary dictionary = mDictionaries.get(key);
+            suggestionsSet.addAll(dictionary.getSuggestions(
+                    wordComposerForLookup, prevWordForBigram, proximityInfo));
         }
 
         // TODO: Change this scheme - a boolean is not enough. A whitelisted word may be "valid"