commit f985efe39c98d03125884b140d7c64bb28914018
author Jean Chalard <jchalard@google.com> Wed Mar 14 18:12:12 2012 +0900
committer Jean Chalard <jchalard@google.com> Wed Mar 14 18:12:12 2012 +0900
tree 6afaca39eb1a6328314c17984e71527218af5af4
parent bdf6d1b18b3cebdde5f39d10066ead34be161baf

Remove a useless parameter

Change-Id: I03005240238fb004c20b2df0d836796e2e8b307f

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 6570f7a..9f5931d 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -931,8 +931,7 @@
                     false /* typedWordValid */,
                     false /* hasAutoCorrectionCandidate */,
                     false /* allowsToBeAutoCorrected */,
-                    false /* isPunctuationSuggestions */,
-                    false /* shouldBlockAutoCorrectionBySafetyNet */);
+                    false /* isPunctuationSuggestions */);
             // When in fullscreen mode, show completions generated by the application
             final boolean isAutoCorrection = false;
             setSuggestions(suggestedWords, isAutoCorrection);
@@ -1794,8 +1793,7 @@
                             false /* typedWordValid */,
                             false /* hasAutoCorrectionCandidate */,
                             false /* allowsToBeAutoCorrected */,
-                            false /* isPunctuationSuggestions */,
-                            false /* shouldBlockAutoCorrectionBySafetyNet */);
+                            false /* isPunctuationSuggestions */);
             showSuggestions(obsoleteSuggestedWords, typedWord);
         }
     }

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

diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index d88047c..d12b9c4 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -187,8 +187,7 @@
                 false /* typedWordValid */,
                 false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
-                true /* isPunctuationSuggestions */,
-                false /* shouldBlockAutoCorrectionBySafetyNet */);
+                true /* isPunctuationSuggestions */);
     }
 
     private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) {
@@ -209,8 +208,7 @@
                 false /* typedWordValid */,
                 false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
-                true /* isPunctuationSuggestions */,
-                false /* shouldBlockAutoCorrectionBySafetyNet */);
+                true /* isPunctuationSuggestions */);
     }
 
     private static String createWordSeparators(final String weakSpaceStrippers,

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

diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 7ac00a3..b93626c 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -273,8 +273,7 @@
                 false /* typedWordValid */,
                 false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
-                false /* isPunctuationSuggestions */,
-                false /* shouldBlockAutoCorrectionBySafetyNet */);
+                false /* isPunctuationSuggestions */);
     }
 
     // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
@@ -446,10 +445,10 @@
         }
         return new SuggestedWords(scoreInfoList,
                 !allowsToBeAutoCorrected /* typedWordValid */,
-                autoCorrectionAvailable /* hasAutoCorrectionCandidate */,
+                autoCorrectionAvailable & !shouldBlockAutoCorrectionBySatefyNet
+                        /* hasAutoCorrectionCandidate */,
                 allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,
-                false /* isPunctuationSuggestions */,
-                shouldBlockAutoCorrectionBySatefyNet);
+                false /* isPunctuationSuggestions */);
     }
 
     @Override

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 7ce1049..201e0f4 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -25,7 +25,7 @@
 
 public class SuggestedWords {
     public static final SuggestedWords EMPTY = new SuggestedWords(
-            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false, false);
+            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false);
 
     public final boolean mTypedWordValid;
     public final boolean mHasAutoCorrectionCandidate;
@@ -37,12 +37,10 @@
             final boolean typedWordValid,
             final boolean hasAutoCorrectionCandidate,
             final boolean allowsToBeAutoCorrected,
-            final boolean isPunctuationSuggestions,
-            final boolean shouldBlockAutoCorrectionBySafetyNet) {
+            final boolean isPunctuationSuggestions) {
         mSuggestedWordInfoList = suggestedWordInfoList;
         mTypedWordValid = typedWordValid;
-        mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate
-                && !shouldBlockAutoCorrectionBySafetyNet;
+        mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;
         mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;
         mIsPunctuationSuggestions = isPunctuationSuggestions;
     }