From ea578f6b1dbcf04ffcc9c673f72a38ed2cfecdfc Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 28 Jun 2012 17:07:30 +0900
Subject: [PATCH] Revert a test for readability (A22)

Change-Id: I1df4cef5ae2736a22273843dce67f0012181bfd3
---
 .../android/inputmethod/latin/Suggest.java    | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 9bbc5314f0..62cce1e709 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -227,20 +227,18 @@ public class Suggest {
                 mWhiteListDictionary.getWhitelistedWord(consideredWord);
 
         final boolean hasAutoCorrection;
-        if (isCorrectionEnabled) {
-            if (null != whitelistedWord) {
-                hasAutoCorrection = true;
-            } else if (!AutoCorrection.isWhitelistedOrNotAWord(
-                    mDictionaries, consideredWord, false)) {
-                hasAutoCorrection = true;
-            } else if (suggestionsSet.isEmpty()) {
-                hasAutoCorrection = false;
-            } else if (AutoCorrection.hasAutoCorrectionForBinaryDictionary(suggestionsSet.first(),
-                    consideredWord, mAutoCorrectionThreshold)) {
-                hasAutoCorrection = true;
-            } else {
-                hasAutoCorrection = false;
-            }
+        if (!isCorrectionEnabled) {
+            hasAutoCorrection = false;
+        } else if (null != whitelistedWord) {
+            hasAutoCorrection = true;
+        } else if (!AutoCorrection.isWhitelistedOrNotAWord(
+                mDictionaries, consideredWord, false)) {
+            hasAutoCorrection = true;
+        } else if (suggestionsSet.isEmpty()) {
+            hasAutoCorrection = false;
+        } else if (AutoCorrection.hasAutoCorrectionForBinaryDictionary(suggestionsSet.first(),
+                consideredWord, mAutoCorrectionThreshold)) {
+            hasAutoCorrection = true;
         } else {
             hasAutoCorrection = false;
         }
-- 
GitLab