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

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

main
Jean Chalard 2012-03-02 02:49:42 -08:00 committed by Android (Google) Code Review
parent 9727aea418 f1967ce322
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 boolean mTypedWordValid;
private final boolean mHasAutoCorrectionCandidate;
public final boolean mHasAutoCorrectionCandidate;
public final boolean mIsPunctuationSuggestions;
private final List<SuggestedWordInfo> mSuggestedWordInfoList;
private boolean mShouldBlockAutoCorrection;
@ -69,10 +69,6 @@ public class SuggestedWords {
return mHasAutoCorrectionCandidate && ((size() > 1 && !mTypedWordValid) || mTypedWordValid);
}
public boolean hasAutoCorrectionCandidate() {
return mHasAutoCorrectionCandidate;
}
public boolean isPunctuationSuggestions() {
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) {
return !suggestions.mTypedWordValid && suggestions.hasAutoCorrectionCandidate()
return !suggestions.mTypedWordValid && suggestions.mHasAutoCorrectionCandidate
&& !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;
}
if (LatinImeLogger.sDBG) {
if (index == mCenterSuggestionIndex && suggestions.hasAutoCorrectionCandidate()
if (index == mCenterSuggestionIndex && suggestions.mHasAutoCorrectionCandidate
&& suggestions.shouldBlockAutoCorrection()) {
return 0xFFFF0000;
}