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

Commit a2581fb8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Update language to comply with Android's inclusive language guidance" am: 9490b1b9 am: 892eabe4

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

Change-Id: I97c7ce3619bbb6570117d9aad43f18ffa2664059
parents a61e424d 892eabe4

java/res/values/config-auto-correction-thresholds.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <!-- Chosen to be slightly less than the "aggressive" threshold. This is the threshold for

    <!-- Chosen to be slightly less than the "aggressive" threshold. This is the threshold for

         a mildly plausible suggestion given the input; if no "plausible" suggestion is present

         a mildly plausible suggestion given the input; if no "plausible" suggestion is present

         for a language, it's a strong indicator the user is not typing in this language, so we

         for a language, it's a strong indicator the user is not typing in this language, so we

         may be more forgiving of whitelist entries in another language. -->

         may be more forgiving of allowlist entries in another language. -->

    <string name="plausibility_threshold" translatable="false">0.065</string>

    <string name="plausibility_threshold" translatable="false">0.065</string>





    <!-- The index of the auto correction threshold values array. -->

    <!-- The index of the auto correction threshold values array. -->

java/res/values/emoji-categories.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
     There is another emoji code point list for JB-MR2 and KLP and later under

     There is another emoji code point list for JB-MR2 and KLP and later under

     res/xml/values-v1[89].-->

     res/xml/values-v1[89].-->

<resources>

<resources>

    <!-- Dummy codeArrays for recents emoji keyboard.

    <!-- Placeholder codeArrays for recents emoji keyboard.

         Do not remove these keys, because they are used as a template. -->

         Do not remove these keys, because they are used as a template. -->

    <array

    <array

        name="emoji_recents"

        name="emoji_recents"

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -523,7 +523,7 @@ public final class BinaryDictionaryFileDumper { 
        }

        }





        // Read from metadata file in resources to get the baseline dictionary info.

        // Read from metadata file in resources to get the baseline dictionary info.

        // This ensures we start with a sane list of available dictionaries.

        // This ensures we start with a valid list of available dictionaries.

        final int metadataResourceId = context.getResources().getIdentifier("metadata",

        final int metadataResourceId = context.getResources().getIdentifier("metadata",

                "raw", DictionaryInfoUtils.RESOURCE_PACKAGE_NAME);

                "raw", DictionaryInfoUtils.RESOURCE_PACKAGE_NAME);

        if (metadataResourceId == 0) {

        if (metadataResourceId == 0) {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -190,7 +190,7 @@ public class RichInputMethodSubtype { 
                    false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */,

                    false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */,

                    SUBTYPE_ID_OF_PLACEHOLDER_NO_LANGUAGE_SUBTYPE));

                    SUBTYPE_ID_OF_PLACEHOLDER_NO_LANGUAGE_SUBTYPE));

    // Caveat: We probably should remove this when we add an Emoji subtype in {@link R.xml.method}.

    // Caveat: We probably should remove this when we add an Emoji subtype in {@link R.xml.method}.

    // Dummy Emoji subtype. See {@link R.xml.method}.

    // Placeholder Emoji subtype. See {@link R.xml.method}.

    private static final int SUBTYPE_ID_OF_PLACEHOLDER_EMOJI_SUBTYPE = 0xd78b2ed0;

    private static final int SUBTYPE_ID_OF_PLACEHOLDER_EMOJI_SUBTYPE = 0xd78b2ed0;

    private static final String EXTRA_VALUE_OF_PLACEHOLDER_EMOJI_SUBTYPE =

    private static final String EXTRA_VALUE_OF_PLACEHOLDER_EMOJI_SUBTYPE =

            "KeyboardLayoutSet=" + SubtypeLocaleUtils.EMOJI

            "KeyboardLayoutSet=" + SubtypeLocaleUtils.EMOJI

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -225,7 +225,7 @@ public final class Suggest { 
                // TODO: now that we have personalization, we may want to re-evaluate this decision

                // TODO: now that we have personalization, we may want to re-evaluate this decision

                || !mDictionaryFacilitator.hasAtLeastOneInitializedMainDictionary()

                || !mDictionaryFacilitator.hasAtLeastOneInitializedMainDictionary()

                // If the first suggestion is a shortcut we never auto-correct to it, regardless

                // If the first suggestion is a shortcut we never auto-correct to it, regardless

                // of how strong it is (whitelist entries are not KIND_SHORTCUT but KIND_WHITELIST).

                // of how strong it is (allowlist entries are not KIND_SHORTCUT but KIND_WHITELIST).

                // TODO: we may want to have shortcut-only entries auto-correct in the future.

                // TODO: we may want to have shortcut-only entries auto-correct in the future.

                || suggestionResults.first().isKindOf(SuggestedWordInfo.KIND_SHORTCUT)) {

                || suggestionResults.first().isKindOf(SuggestedWordInfo.KIND_SHORTCUT)) {

            hasAutoCorrection = false;

            hasAutoCorrection = false;