commit 1343d27de30c4010c54576d6c8bbb052c7630cbe
author Jean Chalard <jchalard@google.com> Wed Jul 11 18:47:35 2012 +0900
committer Jean Chalard <jchalard@google.com> Thu Jul 12 15:58:16 2012 +0900
tree 058f030ae00a9568ee211269a9bf277c78318652
parent 24a63b5537ea4872ec10676d147ddccabda6a1f6

Readability improvement (A117)

Change-Id: I6f8bb05a23edb40a079da60b7136170ec9043282

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 7dbba94..31566bf 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -219,6 +219,7 @@
         // the current settings. It may also be useful to know, when the setting is off, whether
         // the word *would* have been auto-corrected.
         if (!isCorrectionEnabled || !allowsToBeAutoCorrected || !wordComposer.isComposingWord()
+                || suggestionsSet.isEmpty()
                 || wordComposer.isMostlyCaps() || wordComposer.isResumed()
                 || !hasMainDictionary()) {
             // If we don't have a main dictionary, we never want to auto-correct. The reason for
@@ -228,13 +229,9 @@
             // would always auto-correct to "Will" which is unwanted. Hence, no main dict => no
             // auto-correct.
             hasAutoCorrection = false;
-        } else if (suggestionsSet.isEmpty()) {
-            hasAutoCorrection = false;
-        } else if (AutoCorrection.suggestionExceedsAutoCorrectionThreshold(suggestionsSet.first(),
-                consideredWord, mAutoCorrectionThreshold)) {
-            hasAutoCorrection = true;
         } else {
-            hasAutoCorrection = false;
+            hasAutoCorrection = AutoCorrection.suggestionExceedsAutoCorrectionThreshold(
+                    suggestionsSet.first(), consideredWord, mAutoCorrectionThreshold);
         }
 
         final ArrayList<SuggestedWordInfo> suggestionsContainer =