commit 5a2c19d4fbfd2e5493a0679be983621e46e50907
author Jean Chalard <jchalard@google.com> Fri Mar 02 02:49:42 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 02 02:49:42 2012 -0800
tree edd76d883eab20d4ce33e4383e6e237c5f2e6e1c
parent 9727aea418b9106a4fc546dd850f1c7dce88b61f
parent f1967ce322a09456035ac56877dc4414250c43a9

Merge "Revert "Make a member read-only""

java/src/com/android/inputmethod/latin/SuggestedWords.java

diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 549628e..ed6359c 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -29,7 +29,7 @@
 
     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 @@
         return mHasAutoCorrectionCandidate && ((size() > 1 && !mTypedWordValid) || mTypedWordValid);
     }
 
-    public boolean hasAutoCorrectionCandidate() {
-        return mHasAutoCorrectionCandidate;
-    }
-
     public boolean isPunctuationSuggestions() {
         return mIsPunctuationSuggestions;
     }

java/src/com/android/inputmethod/latin/Utils.java

diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index cd2f951..47ea9ee 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -775,7 +775,7 @@
     }
 
     public static boolean willAutoCorrect(SuggestedWords suggestions) {
-        return !suggestions.mTypedWordValid && suggestions.hasAutoCorrectionCandidate()
+        return !suggestions.mTypedWordValid && suggestions.mHasAutoCorrectionCandidate
                 && !suggestions.shouldBlockAutoCorrection();
     }
 

java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java

diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
index 312e29a..40d7826 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 @@
                 color = mColorTypedWord;
             }
             if (LatinImeLogger.sDBG) {
-                if (index == mCenterSuggestionIndex && suggestions.hasAutoCorrectionCandidate()
+                if (index == mCenterSuggestionIndex && suggestions.mHasAutoCorrectionCandidate
                         && suggestions.shouldBlockAutoCorrection()) {
                     return 0xFFFF0000;
                 }