Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58cdd3ed authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

Merge "Update LatinIME to comply with Android's inclusive language guidance"... 

Merge "Update LatinIME to comply with Android's inclusive language guidance" am: 33fa7e71 am: dcf1ecf7 am: 188b10a3 am: 86727e6b am: ac34bd40

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

Change-Id: Ifb6f1c248eebb8333251ebaaca34f428d97fced8
parents 66cbfb7b ac34bd40

dictionaries/sample.combined

+1 −1
Original line number Diff line number Diff line
@@ -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

java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }