nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Some renaming"

main
Jean Chalard 2012-03-04 17:26:22 -08:00 committed by Android (Google) Code Review
parent 0af449aa64 a83a53ba24
commit c2136c4e63
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1838,7 +1838,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
final boolean shouldBlockAutoCorrectionBySafetyNet =
Utils.shouldBlockAutoCorrectionBySafetyNet(suggestedWords, mSuggest);
if (shouldBlockAutoCorrectionBySafetyNet) {
suggestedWords.setShouldBlockAutoCorrection();
suggestedWords.setShouldBlockAutoCorrectionBySatefyNet();
}
final CharSequence autoCorrection;
if (suggestedWords.size() > 0) {

12
java/src/com/android/inputmethod/latin/SuggestedWords.java
View File

@ -32,7 +32,7 @@ public class SuggestedWords {
public final boolean mHasAutoCorrectionCandidate;
public final boolean mIsPunctuationSuggestions;
private final List<SuggestedWordInfo> mSuggestedWordInfoList;
private boolean mShouldBlockAutoCorrection;
private boolean mShouldBlockAutoCorrectionBySafetyNet;
private SuggestedWords(List<CharSequence> words, boolean typedWordValid,
boolean hasAutoCorrectionCandidate, boolean isPunctuationSuggestions,
@ -46,7 +46,7 @@ public class SuggestedWords {
mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;
mIsPunctuationSuggestions = isPunctuationSuggestions;
mSuggestedWordInfoList = suggestedWordInfoList;
mShouldBlockAutoCorrection = false;
mShouldBlockAutoCorrectionBySafetyNet = false;
}
public int size() {
@ -69,12 +69,12 @@ public class SuggestedWords {
return mIsPunctuationSuggestions;
}
public void setShouldBlockAutoCorrection() {
mShouldBlockAutoCorrection = true;
public void setShouldBlockAutoCorrectionBySatefyNet() {
mShouldBlockAutoCorrectionBySafetyNet = true;
}
public boolean shouldBlockAutoCorrection() {
return mShouldBlockAutoCorrection;
public boolean shouldBlockAutoCorrectionBySafetyNet() {
return mShouldBlockAutoCorrectionBySafetyNet;
}
public static class Builder {

2
java/src/com/android/inputmethod/latin/Utils.java
View File

@ -776,7 +776,7 @@ public class Utils {
public static boolean willAutoCorrect(SuggestedWords suggestions) {
return !suggestions.mTypedWordValid && suggestions.mHasAutoCorrectionCandidate
&& !suggestions.shouldBlockAutoCorrection();
&& !suggestions.shouldBlockAutoCorrectionBySafetyNet();
}
public static class Stats {

2
java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
View File

@ -308,7 +308,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
}
if (LatinImeLogger.sDBG) {
if (index == mCenterSuggestionIndex && suggestions.mHasAutoCorrectionCandidate
&& suggestions.shouldBlockAutoCorrection()) {
&& suggestions.shouldBlockAutoCorrectionBySafetyNet()) {
return 0xFFFF0000;
}
}