From 6a43e39bf077bcb706be5e5a84056a3f62580ad7 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 2 Mar 2012 19:17:57 +0900 Subject: [PATCH] Make a member read-only Change-Id: I9a718eaf07e1b6c659e649350d3605f365db2839 --- java/src/com/android/inputmethod/latin/SuggestedWords.java | 6 +++++- java/src/com/android/inputmethod/latin/Utils.java | 2 +- .../inputmethod/latin/suggestions/SuggestionsView.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java index ed6359cfa..549628ef0 100644 --- a/java/src/com/android/inputmethod/latin/SuggestedWords.java +++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java @@ -29,7 +29,7 @@ public class SuggestedWords { public final List mWords; public final boolean mTypedWordValid; - public final boolean mHasAutoCorrectionCandidate; + private final boolean mHasAutoCorrectionCandidate; public final boolean mIsPunctuationSuggestions; private final List mSuggestedWordInfoList; private boolean mShouldBlockAutoCorrection; @@ -69,6 +69,10 @@ public class SuggestedWords { return mHasAutoCorrectionCandidate && ((size() > 1 && !mTypedWordValid) || mTypedWordValid); } + public boolean hasAutoCorrectionCandidate() { + return mHasAutoCorrectionCandidate; + } + public boolean isPunctuationSuggestions() { return mIsPunctuationSuggestions; } diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java index 47ea9ee8a..cd2f95180 100644 --- a/java/src/com/android/inputmethod/latin/Utils.java +++ b/java/src/com/android/inputmethod/latin/Utils.java @@ -775,7 +775,7 @@ public class Utils { } public static boolean willAutoCorrect(SuggestedWords suggestions) { - return !suggestions.mTypedWordValid && suggestions.mHasAutoCorrectionCandidate + return !suggestions.mTypedWordValid && suggestions.hasAutoCorrectionCandidate() && !suggestions.shouldBlockAutoCorrection(); } diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java index 40d782640..312e29abd 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java +++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java @@ -307,7 +307,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, color = mColorTypedWord; } if (LatinImeLogger.sDBG) { - if (index == mCenterSuggestionIndex && suggestions.mHasAutoCorrectionCandidate + if (index == mCenterSuggestionIndex && suggestions.hasAutoCorrectionCandidate() && suggestions.shouldBlockAutoCorrection()) { return 0xFFFF0000; }