diff options
| author |   Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-23 05:08:17 +0000 |
|---|---|---|
| committer |   Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 05:08:17 +0000 |
| commit | 9ebba46c775f37abeb0451602cb323fd45adf33b (patch) | |
| tree | c75e84df0f6ed9f9d1dc24b6fe27167bb4d8522e /java/res | |
| parent | 99e432986bcbce1d24978421a5bcbddc81db90cd (diff) | |
| parent | a61e424d0a63a5c86fa490a006c20767dd173d3f (diff) | |
| download | latinime-9ebba46c775f37abeb0451602cb323fd45adf33b.tar.gz latinime-9ebba46c775f37abeb0451602cb323fd45adf33b.tar.xz latinime-9ebba46c775f37abeb0451602cb323fd45adf33b.zip | |
Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb192212f am: a2695d0ca6 am: a61e424d0a
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236
Change-Id: I59c0f66bf37497f687d45d7a56e837eecda26c11
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/xml-sw600dp/key_styles_common.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_accounts.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index ea8f29250..3d25f4295 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -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" diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index d85438d99..fbc44da38 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -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" diff --git a/java/res/xml/prefs_screen_accounts.xml b/java/res/xml/prefs_screen_accounts.xml index 75fff52c6..415b0b4e1 100644 --- a/java/res/xml/prefs_screen_accounts.xml +++ b/java/res/xml/prefs_screen_accounts.xml @@ -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 |