aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-04-26 01:26:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-26 01:26:08 -0700
commit330072b0146ffe148417d43ee0842c1238b6923d (patch)
tree1349a07af3761ff21db1c9cfb9a75d7778642991 /java/res
parenta9b0c4fb9d0247ccdc92984de2d972136a8d34bb (diff)
parentc03aaa1bde589f582daa83f1ecdc66ce8a4691b2 (diff)
downloadlatinime-330072b0146ffe148417d43ee0842c1238b6923d.tar.gz
latinime-330072b0146ffe148417d43ee0842c1238b6923d.tar.xz
latinime-330072b0146ffe148417d43ee0842c1238b6923d.zip
am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering."
* commit 'c03aaa1bde589f582daa83f1ecdc66ce8a4691b2': [ZF2] Read settings for profanity filtering.
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/config.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index f2e76bd29..5b11e0711 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -75,6 +75,7 @@
<!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
false -->
<bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
+ <bool name="config_block_potentially_offensive">true</bool>
<integer name="config_gesture_floating_preview_text_linger_timeout">200</integer>
<integer name="config_gesture_preview_trail_fadeout_start_delay">100</integer>
<integer name="config_gesture_preview_trail_fadeout_duration">800</integer>