Merge "Update language to comply with Android’s inclusive language guidance" am: b01f678ca8

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237

Change-Id: I5a54bf19ea1ba28abfc4e4451f23bc008749b344

2 files changed, 13 insertions, 13 deletions

diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
index 68f041589..bc9881bde 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
+++ b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
@@ -118,15 +118,15 @@ public class UserHistoryDictionaryTests {
     private void doTestRandomWords(final String testAccount) {
         Log.d(TAG, "This test can be used for profiling.");
         Log.d(TAG, "Usage: please set UserHistoryDictionary.PROFILE_SAVE_RESTORE to true.");
-        final Locale dummyLocale = UserHistoryDictionaryTestsHelper.getDummyLocale("random_words");
+        final Locale fakeLocale = UserHistoryDictionaryTestsHelper.getFakeLocale("random_words");
         final String dictName = UserHistoryDictionary.getUserHistoryDictName(
-                UserHistoryDictionary.NAME, dummyLocale,
+                UserHistoryDictionary.NAME, fakeLocale,
                 null /* dictFile */,
                 testAccount /* account */);
         final File dictFile = ExpandableBinaryDictionary.getDictFile(
                 getContext(), dictName, null /* dictFile */);
         final UserHistoryDictionary dict = PersonalizationHelper.getUserHistoryDictionary(
-                getContext(), dummyLocale, testAccount);
+                getContext(), fakeLocale, testAccount);
         clearHistory(dict);
 
         final int numberOfWords = 1000;
@@ -169,15 +169,15 @@ public class UserHistoryDictionaryTests {
 
             // Create filename suffixes for this test.
             for (int i = 0; i < numberOfLanguages; i++) {
-                final Locale dummyLocale =
-                        UserHistoryDictionaryTestsHelper.getDummyLocale("switching_languages" + i);
+                final Locale fakeLocale =
+                        UserHistoryDictionaryTestsHelper.getFakeLocale("switching_languages" + i);
                 final String dictName = UserHistoryDictionary.getUserHistoryDictName(
-                        UserHistoryDictionary.NAME, dummyLocale, null /* dictFile */,
+                        UserHistoryDictionary.NAME, fakeLocale, null /* dictFile */,
                         testAccount /* account */);
                 dictFiles[i] = ExpandableBinaryDictionary.getDictFile(
                         getContext(), dictName, null /* dictFile */);
                 dicts[i] = PersonalizationHelper.getUserHistoryDictionary(getContext(),
-                        dummyLocale, testAccount);
+                        fakeLocale, testAccount);
                 clearHistory(dicts[i]);
             }
 
@@ -214,19 +214,19 @@ public class UserHistoryDictionaryTests {
     }
 
     private void doTestAddManyWords(final String testAccount) {
-        final Locale dummyLocale =
-                UserHistoryDictionaryTestsHelper.getDummyLocale("many_random_words");
+        final Locale fakeLocale =
+                UserHistoryDictionaryTestsHelper.getFakeLocale("many_random_words");
         final String dictName = UserHistoryDictionary.getUserHistoryDictName(
-                UserHistoryDictionary.NAME, dummyLocale, null /* dictFile */, testAccount);
+                UserHistoryDictionary.NAME, fakeLocale, null /* dictFile */, testAccount);
         final File dictFile = ExpandableBinaryDictionary.getDictFile(
                 getContext(), dictName, null /* dictFile */);
         final int numberOfWords = 10000;
         final Random random = new Random(123456);
         final UserHistoryDictionary dict = PersonalizationHelper.getUserHistoryDictionary(
-                getContext(), dummyLocale, testAccount);
+                getContext(), fakeLocale, testAccount);
         clearHistory(dict);
         assertTrue(UserHistoryDictionaryTestsHelper.addAndWriteRandomWords(dict,
                 numberOfWords, random, true /* checksContents */, mCurrentTime));
         assertDictionaryExists(dict, dictFile);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java
index d3ea2705b..73d7e7339 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java
+++ b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java
@@ -110,7 +110,7 @@ public class UserHistoryDictionaryTestsHelper {
     /**
      * Creates unique test locale for using within tests.
      */
-    public static Locale getDummyLocale(final String name) {
+    public static Locale getFakeLocale(final String name) {
         return new Locale(TEST_LOCALE_PREFIX + name + System.currentTimeMillis());
     }