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

am bb6f9146: DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman 

Merge commit 'bb6f9146f1de4e0bdfaafca1d1896e02d038751d' into eclair-plus-aosp

* commit 'bb6f9146f1de4e0bdfaafca1d1896e02d038751d':
  DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman
main
Amith Yamasani 2009-12-03 05:41:29 -08:00 committed by Android Git Automerger
parent 9af82ee226 bb6f9146f1
commit 929dc479b0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/inputmethod/latin/BinaryDictionary.java
View File

@ -36,7 +36,6 @@ public class BinaryDictionary extends Dictionary {
private int mNativeDict; private int mNativeDict;
private int[] mInputCodes = new int[MAX_WORD_LENGTH * MAX_ALTERNATIVES]; private int[] mInputCodes = new int[MAX_WORD_LENGTH * MAX_ALTERNATIVES];
private WordCallback mWordCallback;
private char[] mOutputChars = new char[MAX_WORD_LENGTH * MAX_WORDS]; private char[] mOutputChars = new char[MAX_WORD_LENGTH * MAX_WORDS];
private int[] mFrequencies = new int[MAX_WORDS]; private int[] mFrequencies = new int[MAX_WORDS];
@ -75,7 +74,6 @@ public class BinaryDictionary extends Dictionary {
@Override @Override
public void getWords(final WordComposer codes, final WordCallback callback) { public void getWords(final WordComposer codes, final WordCallback callback) {
mWordCallback = callback;
final int codesSize = codes.size(); final int codesSize = codes.size();
// Wont deal with really long words. // Wont deal with really long words.
if (codesSize > MAX_WORD_LENGTH - 1) return; if (codesSize > MAX_WORD_LENGTH - 1) return;
@ -123,7 +121,7 @@ public class BinaryDictionary extends Dictionary {
@Override @Override
public boolean isValidWord(CharSequence word) { public boolean isValidWord(CharSequence word) {
if (word == null) return false; if (word == null) return false;
char[] chars = word.toString().toLowerCase().toCharArray(); char[] chars = word.toString().toCharArray();
return isValidWordNative(mNativeDict, chars, chars.length); return isValidWordNative(mNativeDict, chars, chars.length);
} }

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

@ -809,7 +809,8 @@ public class LatinIME extends InputMethodService
//|| mCorrectionMode == mSuggest.CORRECTION_FULL; //|| mCorrectionMode == mSuggest.CORRECTION_FULL;
CharSequence typedWord = mWord.getTypedWord(); CharSequence typedWord = mWord.getTypedWord();
// If we're in basic correct // If we're in basic correct
boolean typedWordValid = mSuggest.isValidWord(typedWord); boolean typedWordValid = mSuggest.isValidWord(typedWord) ||
(preferCapitalization() && mSuggest.isValidWord(typedWord.toString().toLowerCase()));
if (mCorrectionMode == Suggest.CORRECTION_FULL) { if (mCorrectionMode == Suggest.CORRECTION_FULL) {
correctionAvailable |= typedWordValid; correctionAvailable |= typedWordValid;
} }