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

Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb192212f am: a2695d0ca6 am: a61e424d0a am: 9ebba46c77 

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

Change-Id: I685b5e27b3ae1301a94471e11daa64e3b146ade7
main
Treehugger Robot 2020-07-23 05:25:14 +00:00 committed by Automerger Merge Worker
parent b586d0f049 9ebba46c77
commit c1a6a00c4f
15 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/res/xml-sw600dp/key_styles_common.xml
View File

@ -38,7 +38,7 @@
<include
latin:keyboardLayout="@xml/key_styles_settings" />
<!-- Functional key styles -->
<!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
<!-- Base style for shift key. A single space is used for base label in moreKeys. -->
<key-style
latin:styleName="baseForShiftKeyStyle"
latin:keyActionFlags="noKeyPreview"

2
java/res/xml/key_styles_common.xml
View File

@ -38,7 +38,7 @@
<include
latin:keyboardLayout="@xml/key_styles_settings" />
<!-- Functional key styles -->
<!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
<!-- Base style for shift key. A single space is used for base label in moreKeys. -->
<key-style
latin:styleName="baseForShiftKeyStyle"
latin:keyActionFlags="noKeyPreview"

2
java/res/xml/prefs_screen_accounts.xml
View File

@ -19,7 +19,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
android:title="@string/settings_screen_accounts">
<!-- This preference is a dummy view of the underlying preference.
<!-- This preference is a fake view of the underlying preference.
This isn't persisted and the summary/title is refreshed by the fragment
after inspecting the underlying account preference. -->
<Preference

2
java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java
View File

@ -870,7 +870,7 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
*/
public static void updateClientInfo(final Context context, final String clientId,
final ContentValues values) {
// Sanity check the content values
// Validity check the content values
final String valuesClientId = values.getAsString(CLIENT_CLIENT_ID_COLUMN);
final String valuesMetadataUri = values.getAsString(CLIENT_METADATA_URI_COLUMN);
final String valuesMetadataAdditionalId =

2
java/src/com/android/inputmethod/event/Event.java
View File

@ -123,7 +123,7 @@ public class Event {
mSuggestedWordInfo = suggestedWordInfo;
mFlags = flags;
mNextEvent = next;
// Sanity checks
// Validity checks
// mSuggestedWordInfo is non-null if and only if the type is SUGGESTION_PICKED
if (EVENT_TYPE_SUGGESTION_PICKED == mEventType) {
if (null == mSuggestedWordInfo) {

2
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View File

@ -100,7 +100,7 @@ public class KeyboardView extends View {
private static final float MAX_LABEL_RATIO = 0.90f;
// Main keyboard
// TODO: Consider having a dummy keyboard object to make this @Nonnull
// TODO: Consider having a base keyboard object to make this @Nonnull
@Nullable
private Keyboard mKeyboard;
@Nonnull

2
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
View File

@ -60,7 +60,7 @@ public final class KeyboardTextsTable {
if (text != null) {
return text;
}
// Sanity check.
// Validity check.
if (index >= 0 && index < TEXTS_DEFAULT.length) {
return TEXTS_DEFAULT[index];
}

6
java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
View File

@ -196,8 +196,8 @@ final public class BinaryDictionaryGetter {
}
// ## HACK ## we prevent usage of a dictionary before version 18. The reason for this is, since
// those do not include whitelist entries, the new code with an old version of the dictionary
// would lose whitelist functionality.
// those do not include allowlist entries, the new code with an old version of the dictionary
// would lose allowlist functionality.
private static boolean hackCanUseDictionaryFile(final File file) {
if (!SHOULD_USE_DICT_VERSION) {
return true;
@ -211,7 +211,7 @@ final public class BinaryDictionaryGetter {
// No version in the options : the format is unexpected
return false;
}
// Version 18 is the first one to include the whitelist
// Version 18 is the first one to include the allowlist.
// Obviously this is a big ## HACK ##
return Integer.parseInt(version) >= 18;
} catch (java.io.FileNotFoundException e) {

2
java/src/com/android/inputmethod/latin/InputAttributes.java
View File

@ -66,7 +66,7 @@ public final class InputAttributes {
|| InputTypeUtils.isVisiblePasswordInputType(inputType);
if (inputClass != InputType.TYPE_CLASS_TEXT) {
// If we are not looking at a TYPE_CLASS_TEXT field, the following strange
// cases may arise, so we do a couple sanity checks for them. If it's a
// cases may arise, so we do a couple validity checks for them. If it's a
// TYPE_CLASS_TEXT field, these special cases cannot happen, by construction
// of the flags.
if (null == editorInfo) {

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

@ -174,35 +174,35 @@ public class RichInputMethodSubtype {
}
}
// Dummy no language QWERTY subtype. See {@link R.xml.method}.
private static final int SUBTYPE_ID_OF_DUMMY_NO_LANGUAGE_SUBTYPE = 0xdde0bfd3;
private static final String EXTRA_VALUE_OF_DUMMY_NO_LANGUAGE_SUBTYPE =
// Placeholer for no language QWERTY subtype. See {@link R.xml.method}.
private static final int SUBTYPE_ID_OF_PLACEHOLDER_NO_LANGUAGE_SUBTYPE = 0xdde0bfd3;
private static final String EXTRA_VALUE_OF_PLACEHOLDER_NO_LANGUAGE_SUBTYPE =
"KeyboardLayoutSet=" + SubtypeLocaleUtils.QWERTY
+ "," + Constants.Subtype.ExtraValue.ASCII_CAPABLE
+ "," + Constants.Subtype.ExtraValue.ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE
+ "," + Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
@Nonnull
private static final RichInputMethodSubtype DUMMY_NO_LANGUAGE_SUBTYPE =
private static final RichInputMethodSubtype PLACEHOLDER_NO_LANGUAGE_SUBTYPE =
new RichInputMethodSubtype(InputMethodSubtypeCompatUtils.newInputMethodSubtype(
R.string.subtype_no_language_qwerty, R.drawable.ic_ime_switcher_dark,
SubtypeLocaleUtils.NO_LANGUAGE, KEYBOARD_MODE,
EXTRA_VALUE_OF_DUMMY_NO_LANGUAGE_SUBTYPE,
EXTRA_VALUE_OF_PLACEHOLDER_NO_LANGUAGE_SUBTYPE,
false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */,
SUBTYPE_ID_OF_DUMMY_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}.
// Dummy Emoji subtype. See {@link R.xml.method}.
private static final int SUBTYPE_ID_OF_DUMMY_EMOJI_SUBTYPE = 0xd78b2ed0;
private static final String EXTRA_VALUE_OF_DUMMY_EMOJI_SUBTYPE =
private static final int SUBTYPE_ID_OF_PLACEHOLDER_EMOJI_SUBTYPE = 0xd78b2ed0;
private static final String EXTRA_VALUE_OF_PLACEHOLDER_EMOJI_SUBTYPE =
"KeyboardLayoutSet=" + SubtypeLocaleUtils.EMOJI
+ "," + Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
@Nonnull
private static final RichInputMethodSubtype DUMMY_EMOJI_SUBTYPE = new RichInputMethodSubtype(
private static final RichInputMethodSubtype PLACEHOLDER_EMOJI_SUBTYPE = new RichInputMethodSubtype(
InputMethodSubtypeCompatUtils.newInputMethodSubtype(
R.string.subtype_emoji, R.drawable.ic_ime_switcher_dark,
SubtypeLocaleUtils.NO_LANGUAGE, KEYBOARD_MODE,
EXTRA_VALUE_OF_DUMMY_EMOJI_SUBTYPE,
EXTRA_VALUE_OF_PLACEHOLDER_EMOJI_SUBTYPE,
false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */,
SUBTYPE_ID_OF_DUMMY_EMOJI_SUBTYPE));
SUBTYPE_ID_OF_PLACEHOLDER_EMOJI_SUBTYPE));
private static RichInputMethodSubtype sNoLanguageSubtype;
private static RichInputMethodSubtype sEmojiSubtype;
@ -223,8 +223,8 @@ public class RichInputMethodSubtype {
}
Log.w(TAG, "Can't find any language with QWERTY subtype");
Log.w(TAG, "No input method subtype found; returning dummy subtype: "
+ DUMMY_NO_LANGUAGE_SUBTYPE);
return DUMMY_NO_LANGUAGE_SUBTYPE;
+ PLACEHOLDER_NO_LANGUAGE_SUBTYPE);
return PLACEHOLDER_NO_LANGUAGE_SUBTYPE;
}
@Nonnull
@ -244,7 +244,7 @@ public class RichInputMethodSubtype {
}
Log.w(TAG, "Can't find emoji subtype");
Log.w(TAG, "No input method subtype found; returning dummy subtype: "
+ DUMMY_EMOJI_SUBTYPE);
return DUMMY_EMOJI_SUBTYPE;
+ PLACEHOLDER_EMOJI_SUBTYPE);
return PLACEHOLDER_EMOJI_SUBTYPE;
}
}

2
java/src/com/android/inputmethod/latin/about/AboutPreferences.java
View File

@ -19,7 +19,7 @@ package com.android.inputmethod.latin.about;
import android.app.Fragment;
/**
* Dummy class of AboutPreferences. Never use this.
* Placeholer class of AboutPreferences. Never use this.
*/
public final class AboutPreferences extends Fragment {
private AboutPreferences() {

4
java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
View File

@ -805,7 +805,7 @@ public final class InputLogic {
if (SpaceState.PHANTOM == inputTransaction.mSpaceState
&& !settingsValues.isWordConnector(codePoint)) {
if (isComposingWord) {
// Sanity check
// Validity check
throw new RuntimeException("Should not be composing here");
}
insertAutomaticSpaceIfOptionsAndTextAllow(settingsValues);
@ -1370,7 +1370,7 @@ public final class InputLogic {
* @return whether it's fine to apply the transformation after this code point.
*/
private static boolean canBeFollowedByDoubleSpacePeriod(final int codePoint) {
// TODO: This should probably be a blacklist rather than a whitelist.
// TODO: This should probably be a denylist rather than a allowlist.
// TODO: This should probably be language-dependant...
return Character.isLetterOrDigit(codePoint)
|| codePoint == Constants.CODE_SINGLE_QUOTE

2
java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java
View File

@ -330,7 +330,7 @@ final class CustomInputStylePreference extends DialogPreference
R.array.predefined_layouts);
// TODO: Should filter out already existing combinations of locale and layout.
for (final String layout : predefinedKeyboardLayoutSet) {
// This is a dummy subtype with NO_LANGUAGE, only for display.
// This is a placeholder for a subtype with NO_LANGUAGE, only for display.
final InputMethodSubtype subtype =
AdditionalSubtypeUtils.createDummyAdditionalSubtype(
SubtypeLocaleUtils.NO_LANGUAGE, layout);

4
java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java
View File

@ -194,10 +194,10 @@ public final class CapsModeUtils {
// English is a special case in that "American typography" rules, which are the most common
// in English, state that a sentence terminator immediately following a quotation mark
// should be swapped with it and de-duplicated (included in the quotation mark),
// e.g. <<Did he say, "let's go home?">>
// e.g. <<Did they say, "let's go home?">>
// No other language has such a rule as far as I know, instead putting inside the quotation
// mark as the exact thing quoted and handling the surrounding punctuation independently,
// e.g. <<Did he say, "let's go home"?>>
// e.g. <<Did they say, "let's go home"?>>
if (spacingAndPunctuations.mUsesAmericanTypography) {
for (; j > 0; j--) {
// Here we look to go over any closing punctuation. This is because in dominant

2
java/src/com/android/inputmethod/latin/utils/RecapitalizeStatus.java
View File

@ -81,7 +81,7 @@ public class RecapitalizeStatus {
private static final int[] EMPTY_STORTED_SEPARATORS = {};
public RecapitalizeStatus() {
// By default, initialize with dummy values that won't match any real recapitalize.
// By default, initialize with fake values that won't match any real recapitalize.
start(-1, -1, "", Locale.getDefault(), EMPTY_STORTED_SEPARATORS);
stop();
}