Merge "Update LatinIME to comply with Android's inclusive language guidance" am: 33fa7e7126 am: dcf1ecf794 am: 188b10a3a5

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

Change-Id: I01cb309f71af6a6b6ec0889b4618926722e3b6fa

2 files changed, 3 insertions, 3 deletions

diff --git a/dictionaries/sample.combined b/dictionaries/sample.combined
index 4fa595e1e..9cbdd2a8a 100644
--- a/dictionaries/sample.combined
+++ b/dictionaries/sample.combined
@@ -14,7 +14,7 @@
 # should not be considered a typo, but that should never be suggested
 # explicitly. An entry may be made not a word by adding a `not_a_word'
 # field with a value of `true'. The main reason for putting such entries
-# into the dictionary is to add shortcut targets and maybe a whitelist
+# into the dictionary is to add shortcut targets and maybe an allowlist
 # replacement.
 #
 # Each word may or may not have any number of shortcut target lines
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java b/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java
index b40866cc2..941149895 100644
--- a/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java
+++ b/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java
@@ -222,7 +222,7 @@ public class RichInputMethodSubtype {
             return noLanguageSubtype;
         }
         Log.w(TAG, "Can't find any language with QWERTY subtype");
-        Log.w(TAG, "No input method subtype found; returning dummy subtype: "
+        Log.w(TAG, "No input method subtype found; returning placeholder subtype: "
                 + PLACEHOLDER_NO_LANGUAGE_SUBTYPE);
         return PLACEHOLDER_NO_LANGUAGE_SUBTYPE;
     }
@@ -243,7 +243,7 @@ public class RichInputMethodSubtype {
             return emojiSubtype;
         }
         Log.w(TAG, "Can't find emoji subtype");
-        Log.w(TAG, "No input method subtype found; returning dummy subtype: "
+        Log.w(TAG, "No input method subtype found; returning placeholder subtype: "
                 + PLACEHOLDER_EMOJI_SUBTYPE);
         return PLACEHOLDER_EMOJI_SUBTYPE;
     }