aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-07-23 04:29:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-23 04:29:32 +0000
commita2695d0ca6d6fbe03aed87513cdf54ae440e08f0 (patch)
treeae3905d1c9f88100c160e6f8800d272adebfdd41 /java/res
parentdaadf71015bf37651ed81a2d5877b480736db5cd (diff)
parent4eb192212f6605efaa0e5f3c6124e0942cf239c5 (diff)
downloadlatinime-a2695d0ca6d6fbe03aed87513cdf54ae440e08f0.tar.gz
latinime-a2695d0ca6d6fbe03aed87513cdf54ae440e08f0.tar.xz
latinime-a2695d0ca6d6fbe03aed87513cdf54ae440e08f0.zip
Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb192212f
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236 Change-Id: Ie132872cad36f2fa2b28eec2be7b4bb148e55d7f
Diffstat (limited to 'java/res')
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml2
-rw-r--r--java/res/xml/key_styles_common.xml2
-rw-r--r--java/res/xml/prefs_screen_accounts.xml2
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