From 2cda148fd5aa047dca6dfd5d78db548a7a8e2bc0 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 28 Jun 2012 18:37:34 +0900
Subject: [PATCH] Simplification (A31)
Change-Id: I9e4d030974ccec1a6256de6ca87610870e404149
---
java/src/com/android/inputmethod/latin/Suggest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 24a10964e4..0af08084ff 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -227,7 +227,7 @@ public class Suggest {
mWhiteListDictionary.getWhitelistedWord(consideredWord);
final boolean hasAutoCorrection;
- if (!isCorrectionEnabled) {
+ if (!isCorrectionEnabled || wordComposer.isMostlyCaps() || wordComposer.isResumed()) {
hasAutoCorrection = false;
} else if (null != whitelistedWord) {
hasAutoCorrection = true;
@@ -243,10 +243,6 @@ 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,
@@ -305,7 +301,7 @@ public class Suggest {
// actual word, it says typedWordValid = false, which looks wrong. We should either
// rename the attribute or change the value.
!isPrediction && !allowsToBeAutoCorrected /* typedWordValid */,
- !isPrediction && autoCorrectionAvailable /* hasAutoCorrectionCandidate */,
+ !isPrediction && hasAutoCorrection, /* hasAutoCorrectionCandidate */
false /* isPunctuationSuggestions */,
false /* isObsoleteSuggestions */,
isPrediction);
--
GitLab