From deb2d88245ddfda6b8012c9a3a5d95246233fbae Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Thu, 28 Jun 2012 18:36:28 +0900 Subject: [PATCH] Small refactoring (A30) Change-Id: I41b413986a3c5bb6697bb7bbced17ed1e361913c --- java/src/com/android/inputmethod/latin/Suggest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index 952296227..24a10964e 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -243,6 +243,10 @@ public class Suggest { } else { hasAutoCorrection = false; } + boolean autoCorrectionAvailable = hasAutoCorrection; + // Don't auto-correct words with multiple capital letter + autoCorrectionAvailable &= !wordComposer.isMostlyCaps(); + autoCorrectionAvailable &= !wordComposer.isResumed(); if (whitelistedWord != null) { suggestionsSet.add(new SuggestedWordInfo(whitelistedWord, @@ -296,10 +300,6 @@ public class Suggest { // always auto-correct to "Will" which is unwanted. Hence, no main dict => no auto-correct. && hasMainDictionary(); - boolean autoCorrectionAvailable = hasAutoCorrection; - // Don't auto-correct words with multiple capital letter - autoCorrectionAvailable &= !wordComposer.isMostlyCaps(); - autoCorrectionAvailable &= !wordComposer.isResumed(); return new SuggestedWords(suggestionsList, // TODO: this first argument is lying. If this is a whitelisted word which is an // actual word, it says typedWordValid = false, which looks wrong. We should either