aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-07-31 17:38:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-31 17:38:18 +0000
commita2581fb80c3cc1fde2596469a4e445fdbf118554 (patch)
treeec284692a5e1b50c13c48b716a741db3476f6489 /java/res
parenta61e424d0a63a5c86fa490a006c20767dd173d3f (diff)
parent892eabe4c5e89b89e5815f1e634450a69fe37db0 (diff)
downloadlatinime-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/res')
-rw-r--r--java/res/values/config-auto-correction-thresholds.xml2
-rw-r--r--java/res/values/emoji-categories.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/res/values/config-auto-correction-thresholds.xml b/java/res/values/config-auto-correction-thresholds.xml
index fc701c7ff..668f90e73 100644
--- a/java/res/values/config-auto-correction-thresholds.xml
+++ b/java/res/values/config-auto-correction-thresholds.xml
@@ -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. -->
diff --git a/java/res/values/emoji-categories.xml b/java/res/values/emoji-categories.xml
index ce82a8b40..ae5ccc74a 100644
--- a/java/res/values/emoji-categories.xml
+++ b/java/res/values/emoji-categories.xml
@@ -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"