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

am baf73311: Merge "[Rlog6] ResearchLogger fix dictionary loading" 

* commit 'baf73311cde23b2bc3b2d9e4d0fd5ba3ebda3687':
  [Rlog6] ResearchLogger fix dictionary loading
main
Kurt Partridge 2012-12-18 12:26:46 -08:00 committed by Android Git Automerger
parent 81d74a998a baf73311cd
commit ec2df9900f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/src/com/android/inputmethod/research/ResearchLogger.java
View File

@ -136,7 +136,6 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
// used to check whether words are not unique // used to check whether words are not unique
private Suggest mSuggest; private Suggest mSuggest;
private Dictionary mDictionary;
private MainKeyboardView mMainKeyboardView; private MainKeyboardView mMainKeyboardView;
private InputMethodService mInputMethodService; private InputMethodService mInputMethodService;
private final Statistics mStatistics; private final Statistics mStatistics;
@ -597,6 +596,13 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
} }
} }
private Dictionary getDictionary() {
if (mSuggest == null) {
return null;
}
return mSuggest.getMainDictionary();
}
private void setIsPasswordView(boolean isPasswordView) { private void setIsPasswordView(boolean isPasswordView) {
mIsPasswordView = isPasswordView; mIsPasswordView = isPasswordView;
} }
@ -726,10 +732,11 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
private static final LogStatement LOGSTATEMENT_COMMIT_RECORD_SPLIT_WORDS = private static final LogStatement LOGSTATEMENT_COMMIT_RECORD_SPLIT_WORDS =
new LogStatement("recordSplitWords", true, false); new LogStatement("recordSplitWords", true, false);
private void onWordComplete(final String word, final long maxTime, final boolean isSplitWords) { private void onWordComplete(final String word, final long maxTime, final boolean isSplitWords) {
final Dictionary dictionary = getDictionary();
if (word != null && word.length() > 0 && hasLetters(word)) { if (word != null && word.length() > 0 && hasLetters(word)) {
mCurrentLogUnit.setWord(word); mCurrentLogUnit.setWord(word);
final boolean isDictionaryWord = mDictionary != null final boolean isDictionaryWord = dictionary != null
&& mDictionary.isValidWord(word); && dictionary.isValidWord(word);
mStatistics.recordWordEntered(isDictionaryWord); mStatistics.recordWordEntered(isDictionaryWord);
} }
final LogUnit newLogUnit = mCurrentLogUnit.splitByTime(maxTime); final LogUnit newLogUnit = mCurrentLogUnit.splitByTime(maxTime);
@ -784,10 +791,11 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
} }
private String scrubWord(String word) { private String scrubWord(String word) {
if (mDictionary == null) { final Dictionary dictionary = getDictionary();
if (dictionary == null) {
return WORD_REPLACEMENT_STRING; return WORD_REPLACEMENT_STRING;
} }
if (mDictionary.isValidWord(word)) { if (dictionary.isValidWord(word)) {
return word; return word;
} }
return WORD_REPLACEMENT_STRING; return WORD_REPLACEMENT_STRING;