commit bd1d7114883877ffa1f650ce901e31720199b02a
author Jean Chalard <jchalard@google.com> Sun Jul 01 22:36:38 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jul 01 22:36:38 2012 -0700
tree 05298c6dee39617733686d2a5f187f4f5696eca6
parent 654d5ba165bb0a3609af42982d616c412d1ccf7c
parent aba432bf8d27cb9709f0410ca8ca234c6065567a

Merge "Remove a duplicate method (A36)"

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

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index e7f5478..d4362f7 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1742,7 +1742,7 @@
     public void showSuggestions(final SuggestedWords suggestedWords, final CharSequence typedWord) {
         final CharSequence autoCorrection;
         if (suggestedWords.size() > 0) {
-            if (suggestedWords.hasAutoCorrectionWord()) {
+            if (suggestedWords.mWillAutoCorrect) {
                 autoCorrection = suggestedWords.getWord(1);
             } else {
                 autoCorrection = typedWord;

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 b980e48..8cc2842 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -66,10 +66,6 @@
         return mSuggestedWordInfoList.get(pos);
     }
 
-    public boolean hasAutoCorrectionWord() {
-        return mHasAutoCorrectionCandidate && size() > 1 && !mTypedWordValid;
-    }
-
     public boolean willAutoCorrect() {
         return mWillAutoCorrect;
     }