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

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

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

Change-Id: Ifb6f1c248eebb8333251ebaaca34f428d97fced8
main
Adrian Roos 2020-08-13 11:59:12 +00:00 committed by Automerger Merge Worker
parent 66cbfb7b72 ac34bd401a
commit 58cdd3ede8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dictionaries/sample.combined
View File

@ -14,7 +14,7 @@
# should not be considered a typo, but that should never be suggested # 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' # 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 # 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. # replacement.
# #
# Each word may or may not have any number of shortcut target lines # Each word may or may not have any number of shortcut target lines

4
java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java
View File

@ -222,7 +222,7 @@ public class RichInputMethodSubtype {
return noLanguageSubtype; return noLanguageSubtype;
} }
Log.w(TAG, "Can't find any language with QWERTY subtype"); 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); + PLACEHOLDER_NO_LANGUAGE_SUBTYPE);
return PLACEHOLDER_NO_LANGUAGE_SUBTYPE; return PLACEHOLDER_NO_LANGUAGE_SUBTYPE;
} }
@ -243,7 +243,7 @@ public class RichInputMethodSubtype {
return emojiSubtype; return emojiSubtype;
} }
Log.w(TAG, "Can't find emoji subtype"); 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); + PLACEHOLDER_EMOJI_SUBTYPE);
return PLACEHOLDER_EMOJI_SUBTYPE; return PLACEHOLDER_EMOJI_SUBTYPE;
} }