Small refactoring (A30)

Change-Id: I41b413986a3c5bb6697bb7bbced17ed1e361913c
This commit is contained in:
Jean Chalard 2012-06-28 18:36:28 +09:00
parent 0a63111821
commit deb2d88245

View file

@ -243,6 +243,10 @@ public class Suggest {
} else { } else {
hasAutoCorrection = false; hasAutoCorrection = false;
} }
boolean autoCorrectionAvailable = hasAutoCorrection;
// Don't auto-correct words with multiple capital letter
autoCorrectionAvailable &= !wordComposer.isMostlyCaps();
autoCorrectionAvailable &= !wordComposer.isResumed();
if (whitelistedWord != null) { if (whitelistedWord != null) {
suggestionsSet.add(new SuggestedWordInfo(whitelistedWord, 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. // always auto-correct to "Will" which is unwanted. Hence, no main dict => no auto-correct.
&& hasMainDictionary(); && hasMainDictionary();
boolean autoCorrectionAvailable = hasAutoCorrection;
// Don't auto-correct words with multiple capital letter
autoCorrectionAvailable &= !wordComposer.isMostlyCaps();
autoCorrectionAvailable &= !wordComposer.isResumed();
return new SuggestedWords(suggestionsList, return new SuggestedWords(suggestionsList,
// TODO: this first argument is lying. If this is a whitelisted word which is an // 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 // actual word, it says typedWordValid = false, which looks wrong. We should either