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

am 1181c5ac: Merge "Fix to follow the field naming conventions." 

* commit '1181c5acbc6bd8834551d8fadca55d41c886a6d8':
  Fix to follow the field naming conventions.
main
Satoshi Kataoka 2013-08-08 01:35:23 -07:00 committed by Android Git Automerger
parent 765179b355 1181c5acbc
commit 6b48c8ba0c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/latin/personalization/DynamicPredictionDictionaryBase.java
View File

@ -77,7 +77,7 @@ public abstract class DynamicPredictionDictionaryBase extends ExpandableDictiona
CollectionUtils.newArrayList(); CollectionUtils.newArrayList();
// Should always be false except when we use this class for test // Should always be false except when we use this class for test
@UsedForTesting boolean isTest = false; @UsedForTesting boolean mIsTest = false;
/* package */ DynamicPredictionDictionaryBase(final Context context, final String locale, /* package */ DynamicPredictionDictionaryBase(final Context context, final String locale,
final SharedPreferences sp, final String dictionaryType) { final SharedPreferences sp, final String dictionaryType) {
@ -298,8 +298,8 @@ public abstract class DynamicPredictionDictionaryBase extends ExpandableDictiona
@Override @Override
protected Void doInBackground(final Void... v) { protected Void doInBackground(final Void... v) {
if (mDynamicPredictionDictionary.isTest) { if (mDynamicPredictionDictionary.mIsTest) {
// If isTest == true, wait until the lock is released. // If mIsTest == true, wait until the lock is released.
mDynamicPredictionDictionary.mBigramListLock.lock(); mDynamicPredictionDictionary.mBigramListLock.lock();
try { try {
doWriteTaskLocked(); doWriteTaskLocked();

2
tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
View File

@ -93,7 +93,7 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
final UserHistoryPredictionDictionary dict = final UserHistoryPredictionDictionary dict =
PersonalizationDictionaryHelper.getUserHistoryPredictionDictionary( PersonalizationDictionaryHelper.getUserHistoryPredictionDictionary(
getContext(), locale, mPrefs); getContext(), locale, mPrefs);
dict.isTest = true; dict.mIsTest = true;
addToDict(dict, words); addToDict(dict, words);