Inline a method (A14)

The new code is worse than the old one, but this is a necessary
step to make things prettier.

Change-Id: If6e8a139bb85e6920c749743c78792a22a8acb45

1 files changed, 11 insertions, 4 deletions

diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 2d388e180..195c19b4d 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -230,10 +230,17 @@ public class Suggest {
         if (isCorrectionEnabled) {
             final SuggestedWordInfo bestSuggestion = suggestionsSet.isEmpty()
                     ? null : suggestionsSet.first();
-            final CharSequence autoCorrection =
-                    AutoCorrection.computeAutoCorrectionWord(mDictionaries, wordComposer,
-                            bestSuggestion, consideredWord, mAutoCorrectionThreshold,
-                            whitelistedWord);
+            final CharSequence autoCorrection;
+            if (AutoCorrection.hasAutoCorrectionForWhitelistedWord(whitelistedWord)) {
+                autoCorrection = whitelistedWord;
+            } else if (AutoCorrection.shouldAutoCorrectToSelf(mDictionaries, consideredWord)) {
+                autoCorrection = consideredWord;
+            } else if (AutoCorrection.hasAutoCorrectionForBinaryDictionary(bestSuggestion,
+                            consideredWord, mAutoCorrectionThreshold)) {
+                autoCorrection = bestSuggestion.mWord;
+            } else {
+                autoCorrection = null;
+            }
             hasAutoCorrection = (null != autoCorrection);
         } else {
             hasAutoCorrection = false;