aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-03-09 22:01:15 +0900
committerJean Chalard <jchalard@google.com>2012-03-09 22:01:15 +0900
commit68823ae08e820f0951447ed12c1bd32a24333d2e (patch)
tree1b6fdb43a3f80d4867be018aaccab8583e9f4b15 /java/src
parentebbb7e9665b2f9bce46ddc2daa82b9ef73f6c712 (diff)
downloadlatinime-68823ae08e820f0951447ed12c1bd32a24333d2e.tar.gz
latinime-68823ae08e820f0951447ed12c1bd32a24333d2e.tar.xz
latinime-68823ae08e820f0951447ed12c1bd32a24333d2e.zip
Make the safety net memory private
Change-Id: I10959d47c980d2e8f2ea995955acf02193e3ff7b
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java3
-rw-r--r--java/src/com/android/inputmethod/latin/SuggestedWords.java5
2 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index c7a0f4903..917adb2c4 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1845,8 +1845,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
public void showSuggestions(final SuggestedWords suggestedWords, final CharSequence typedWord) {
final CharSequence autoCorrection;
if (suggestedWords.size() > 0) {
- if (!suggestedWords.mShouldBlockAutoCorrectionBySafetyNet
- && suggestedWords.hasAutoCorrectionWord()) {
+ if (suggestedWords.hasAutoCorrectionWord()) {
autoCorrection = suggestedWords.getWord(1);
} else {
autoCorrection = typedWord;
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 2018bcac7..059d6847b 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -33,7 +33,7 @@ public class SuggestedWords {
public final boolean mTypedWordValid;
public final boolean mHasAutoCorrectionCandidate;
public final boolean mIsPunctuationSuggestions;
- public final boolean mShouldBlockAutoCorrectionBySafetyNet;
+ private final boolean mShouldBlockAutoCorrectionBySafetyNet;
private final List<SuggestedWordInfo> mSuggestedWordInfoList;
SuggestedWords(List<CharSequence> words, boolean typedWordValid,
@@ -65,7 +65,8 @@ public class SuggestedWords {
}
public boolean hasAutoCorrectionWord() {
- return mHasAutoCorrectionCandidate && size() > 1 && !mTypedWordValid;
+ return !mShouldBlockAutoCorrectionBySafetyNet
+ && mHasAutoCorrectionCandidate && size() > 1 && !mTypedWordValid;
}
public boolean willAutoCorrect() {