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

Merge "Remove useless code and storage (A6)"

main
Jean Chalard 2012-06-26 01:16:32 -07:00 committed by Android (Google) Code Review
parent 8fb0ff00b1 17111afcd6
commit b9f99c8679
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
java/src/com/android/inputmethod/latin/Suggest.java
View File

@ -76,12 +76,9 @@ public class Suggest implements Dictionary.WordCallback {
public static final int MAX_SUGGESTIONS = 18; public static final int MAX_SUGGESTIONS = 18;
private static final int PREF_MAX_BIGRAMS = 60;
private float mAutoCorrectionThreshold; private float mAutoCorrectionThreshold;
private ArrayList<SuggestedWordInfo> mSuggestions = new ArrayList<SuggestedWordInfo>(); private ArrayList<SuggestedWordInfo> mSuggestions = new ArrayList<SuggestedWordInfo>();
private ArrayList<SuggestedWordInfo> mBigramSuggestions = new ArrayList<SuggestedWordInfo>();
private CharSequence mConsideredWord; private CharSequence mConsideredWord;
// TODO: Remove these member variables by passing more context to addWord() callback method // TODO: Remove these member variables by passing more context to addWord() callback method
@ -212,10 +209,6 @@ public class Suggest implements Dictionary.WordCallback {
return sb; return sb;
} }
protected void addBigramToSuggestions(SuggestedWordInfo bigram) {
mSuggestions.add(bigram);
}
private static final WordComposer sEmptyWordComposer = new WordComposer(); private static final WordComposer sEmptyWordComposer = new WordComposer();
public SuggestedWords getBigramPredictions(CharSequence prevWordForBigram) { public SuggestedWords getBigramPredictions(CharSequence prevWordForBigram) {
LatinImeLogger.onStartSuggestion(prevWordForBigram); LatinImeLogger.onStartSuggestion(prevWordForBigram);
@ -228,16 +221,8 @@ public class Suggest implements Dictionary.WordCallback {
LatinImeLogger.onAddSuggestedWord("", Suggest.DIC_USER_TYPED, Dictionary.UNIGRAM); LatinImeLogger.onAddSuggestedWord("", Suggest.DIC_USER_TYPED, Dictionary.UNIGRAM);
mConsideredWord = ""; mConsideredWord = "";
mBigramSuggestions = new ArrayList<SuggestedWordInfo>(PREF_MAX_BIGRAMS);
getAllBigrams(prevWordForBigram, sEmptyWordComposer); getAllBigrams(prevWordForBigram, sEmptyWordComposer);
// Nothing entered: return all bigrams for the previous word
int insertCount = Math.min(mBigramSuggestions.size(), MAX_SUGGESTIONS);
for (int i = 0; i < insertCount; ++i) {
addBigramToSuggestions(mBigramSuggestions.get(i));
}
SuggestedWordInfo.removeDups(mSuggestions); SuggestedWordInfo.removeDups(mSuggestions);
return new SuggestedWords(mSuggestions, return new SuggestedWords(mSuggestions,
@ -269,15 +254,8 @@ public class Suggest implements Dictionary.WordCallback {
if (wordComposer.size() <= 1 && isCorrectionEnabled) { if (wordComposer.size() <= 1 && isCorrectionEnabled) {
// At first character typed, search only the bigrams // At first character typed, search only the bigrams
mBigramSuggestions = new ArrayList<SuggestedWordInfo>(PREF_MAX_BIGRAMS);
if (!TextUtils.isEmpty(prevWordForBigram)) { if (!TextUtils.isEmpty(prevWordForBigram)) {
getAllBigrams(prevWordForBigram, wordComposer); getAllBigrams(prevWordForBigram, wordComposer);
// Nothing entered: return all bigrams for the previous word
int insertCount = Math.min(mBigramSuggestions.size(), MAX_SUGGESTIONS);
for (int i = 0; i < insertCount; ++i) {
addBigramToSuggestions(mBigramSuggestions.get(i));
}
} }
} else if (wordComposer.size() > 1) { } else if (wordComposer.size() > 1) {
final WordComposer wordComposerForLookup; final WordComposer wordComposerForLookup;
@ -423,13 +401,8 @@ public class Suggest implements Dictionary.WordCallback {
int dataTypeForLog = dataType; int dataTypeForLog = dataType;
final ArrayList<SuggestedWordInfo> suggestions; final ArrayList<SuggestedWordInfo> suggestions;
final int prefMaxSuggestions; final int prefMaxSuggestions;
if (dataType == Dictionary.BIGRAM) { suggestions = mSuggestions;
suggestions = mBigramSuggestions; prefMaxSuggestions = MAX_SUGGESTIONS;
prefMaxSuggestions = PREF_MAX_BIGRAMS;
} else {
suggestions = mSuggestions;
prefMaxSuggestions = MAX_SUGGESTIONS;
}
int pos = 0; int pos = 0;