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

Commit 9490b1b9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 4eb19221 1d9bf420

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

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

         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>



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

java/res/values/emoji-categories.xml

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

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

<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. -->

    <array

        name="emoji_recents"

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

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

        // 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",

                "raw", DictionaryInfoUtils.RESOURCE_PACKAGE_NAME);

        if (metadataResourceId == 0) {

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

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

                    SUBTYPE_ID_OF_PLACEHOLDER_NO_LANGUAGE_SUBTYPE));

    // 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 String EXTRA_VALUE_OF_PLACEHOLDER_EMOJI_SUBTYPE =

            "KeyboardLayoutSet=" + SubtypeLocaleUtils.EMOJI

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

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

                || !mDictionaryFacilitator.hasAtLeastOneInitializedMainDictionary()

                // 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.

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

            hasAutoCorrection = false;