diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-03-02 02:49:42 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-03-02 02:49:42 -0800 |
| commit | 5a2c19d4fbfd2e5493a0679be983621e46e50907 (patch) | |
| tree | edd76d883eab20d4ce33e4383e6e237c5f2e6e1c /java/src | |
| parent | 9727aea418b9106a4fc546dd850f1c7dce88b61f (diff) | |
| parent | f1967ce322a09456035ac56877dc4414250c43a9 (diff) | |
| download | latinime-5a2c19d4fbfd2e5493a0679be983621e46e50907.tar.gz latinime-5a2c19d4fbfd2e5493a0679be983621e46e50907.tar.xz latinime-5a2c19d4fbfd2e5493a0679be983621e46e50907.zip | |
Merge "Revert "Make a member read-only""
Diffstat (limited to 'java/src')
3 files changed, 3 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java index 549628ef0..ed6359cfa 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<CharSequence> mWords; public final boolean mTypedWordValid; - private final boolean mHasAutoCorrectionCandidate; + public final boolean mHasAutoCorrectionCandidate; public final boolean mIsPunctuationSuggestions; private final List<SuggestedWordInfo> mSuggestedWordInfoList; private boolean mShouldBlockAutoCorrection; @@ -69,10 +69,6 @@ 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 cd2f95180..47ea9ee8a 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.hasAutoCorrectionCandidate() + return !suggestions.mTypedWordValid && suggestions.mHasAutoCorrectionCandidate && !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 312e29abd..40d782640 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.hasAutoCorrectionCandidate() + if (index == mCenterSuggestionIndex && suggestions.mHasAutoCorrectionCandidate && suggestions.shouldBlockAutoCorrection()) { return 0xFFFF0000; } |