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

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

Browse source
This commit is contained in:
Jean Chalard 2012-03-02 02:49:42 -08:00 committed by Android (Google) Code Review
commit 5a2c19d4fb
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/src/com/android/inputmethod/latin/SuggestedWords.java
View file

@ -29,7 +29,7 @@ public class SuggestedWords {
public final List<CharSequence> mWords; public final List<CharSequence> mWords;
public final boolean mTypedWordValid; public final boolean mTypedWordValid;
private final boolean mHasAutoCorrectionCandidate; public final boolean mHasAutoCorrectionCandidate;
public final boolean mIsPunctuationSuggestions; public final boolean mIsPunctuationSuggestions;
private final List<SuggestedWordInfo> mSuggestedWordInfoList; private final List<SuggestedWordInfo> mSuggestedWordInfoList;
private boolean mShouldBlockAutoCorrection; private boolean mShouldBlockAutoCorrection;
@ -69,10 +69,6 @@ public class SuggestedWords {
return mHasAutoCorrectionCandidate && ((size() > 1 && !mTypedWordValid) || mTypedWordValid); return mHasAutoCorrectionCandidate && ((size() > 1 && !mTypedWordValid) || mTypedWordValid);
} }
public boolean hasAutoCorrectionCandidate() {
return mHasAutoCorrectionCandidate;
}
public boolean isPunctuationSuggestions() { public boolean isPunctuationSuggestions() {
return mIsPunctuationSuggestions; return mIsPunctuationSuggestions;
} }

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

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

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

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