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

* commit '1181c5acbc6bd8834551d8fadca55d41c886a6d8':
  Fix to follow the field naming conventions.

2 files changed, 4 insertions, 4 deletions

diff --git a/java/src/com/android/inputmethod/latin/personalization/DynamicPredictionDictionaryBase.java b/java/src/com/android/inputmethod/latin/personalization/DynamicPredictionDictionaryBase.java
index 6498bf9c1..bb6ec6b1c 100644
--- a/java/src/com/android/inputmethod/latin/personalization/DynamicPredictionDictionaryBase.java
+++ b/java/src/com/android/inputmethod/latin/personalization/DynamicPredictionDictionaryBase.java
@@ -77,7 +77,7 @@ public abstract class DynamicPredictionDictionaryBase extends ExpandableDictiona
             CollectionUtils.newArrayList();
 
     // 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,
             final SharedPreferences sp, final String dictionaryType) {
@@ -298,8 +298,8 @@ public abstract class DynamicPredictionDictionaryBase extends ExpandableDictiona
 
         @Override
         protected Void doInBackground(final Void... v) {
-            if (mDynamicPredictionDictionary.isTest) {
-                // If isTest == true, wait until the lock is released.
+            if (mDynamicPredictionDictionary.mIsTest) {
+                // If mIsTest == true, wait until the lock is released.
                 mDynamicPredictionDictionary.mBigramListLock.lock();
                 try {
                     doWriteTaskLocked();
diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
index 8f9ef1ddd..b3e2ee0ff 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
+++ b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
@@ -93,7 +93,7 @@ public class UserHistoryDictionaryTests extends AndroidTestCase {
             final UserHistoryPredictionDictionary dict =
                     PersonalizationDictionaryHelper.getUserHistoryPredictionDictionary(
                             getContext(), locale, mPrefs);
-            dict.isTest = true;
+            dict.mIsTest = true;
 
             addToDict(dict, words);