Merge "Fix to follow the field naming conventions."
commit
1181c5acbc
|
@ -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();
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue