diff options
| author |   Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-31 17:38:18 +0000 |
|---|---|---|
| committer |   Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-31 17:38:18 +0000 |
| commit | a2581fb80c3cc1fde2596469a4e445fdbf118554 (patch) | |
| tree | ec284692a5e1b50c13c48b716a741db3476f6489 /java/src | |
| parent | a61e424d0a63a5c86fa490a006c20767dd173d3f (diff) | |
| parent | 892eabe4c5e89b89e5815f1e634450a69fe37db0 (diff) | |
| download | latinime-a2581fb80c3cc1fde2596469a4e445fdbf118554.tar.gz latinime-a2581fb80c3cc1fde2596469a4e445fdbf118554.tar.xz latinime-a2581fb80c3cc1fde2596469a4e445fdbf118554.zip | |
Merge "Update language to comply with Android's inclusive language guidance" am: 9490b1b92f am: 892eabe4c5
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602
Change-Id: I97c7ce3619bbb6570117d9aad43f18ffa2664059
Diffstat (limited to 'java/src')
3 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java index 1fe0a4cce..648610c86 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java @@ -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) { diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java b/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java index 95204265d..b40866cc2 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java @@ -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 diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index 7ccefd2dd..da23617af 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -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; |