Merge "Refactoring (A43)"

main
Jean Chalard 2012-07-03 19:40:19 -07:00 committed by Android (Google) Code Review
commit accd63f35f
1 changed files with 3 additions and 3 deletions

View File

@ -229,8 +229,8 @@ public class Suggest {
mWhiteListDictionary.getWhitelistedWord(consideredWord);
final boolean hasAutoCorrection;
if (!isCorrectionEnabled || wordComposer.isMostlyCaps() || wordComposer.isResumed()
|| !hasMainDictionary()) {
if (!isCorrectionEnabled || !allowsToBeAutoCorrected || wordComposer.isMostlyCaps()
|| wordComposer.isResumed() || !hasMainDictionary()) {
// If we don't have a main dictionary, we never want to auto-correct. The reason for
// this is, the user may have a contact whose name happens to match a valid word in
// their language, and it will unexpectedly auto-correct. For example, if the user
@ -293,7 +293,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 && hasAutoCorrection && allowsToBeAutoCorrected, /* willAutoCorrect */
!isPrediction && hasAutoCorrection, /* willAutoCorrect */
false /* isPunctuationSuggestions */,
false /* isObsoleteSuggestions */,
isPrediction);