diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-04-26 01:26:09 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 01:26:09 -0700 |
| commit | 42abed7ff30b4ad4c04407a81db8de86244b1d80 (patch) | |
| tree | b0cd593016cfaaee467717e95312cd8564a5a6d3 /java | |
| parent | 330072b0146ffe148417d43ee0842c1238b6923d (diff) | |
| parent | 9a98ef696826a73fe676cb12e9755c04d868b668 (diff) | |
| download | latinime-42abed7ff30b4ad4c04407a81db8de86244b1d80.tar.gz latinime-42abed7ff30b4ad4c04407a81db8de86244b1d80.tar.xz latinime-42abed7ff30b4ad4c04407a81db8de86244b1d80.zip | |
am 9a98ef69: Merge "[ZF3] Add the option to block potentially offensive words"
* commit '9a98ef696826a73fe676cb12e9755c04d868b668':
[ZF3] Add the option to block potentially offensive words
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 9bf4ddde6..a5567daa7 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -111,6 +111,11 @@ <string name="prefs_suggestion_visibility_show_only_portrait_name">Show in portrait mode</string> <string name="prefs_suggestion_visibility_hide_name">Always hide</string> + <!-- Option to block potentially offensive words to be shown [CHAR_LIMIT=30] --> + <string name="prefs_block_potentially_offensive_title">Block offensive words</string> + <!-- Summary for option to block potentially offensive words to be shown [CHAR_LIMIT=80 (two lines) or 40 (fits on one line, preferable)] --> + <string name="prefs_block_potentially_offensive_summary">Do not suggest potentially offensive words</string> + <!-- Option to decide the auto correction threshold score --> <!-- Option to enable auto correction [CHAR LIMIT=20]--> <string name="auto_correction">Auto-correction</string> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index eea90f94b..51e3420e9 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -69,6 +69,12 @@ android:value="@string/dictionary_pack_client_id" /> </intent> </PreferenceScreen> + <CheckBoxPreference + android:key="pref_key_block_potentially_offensive" + android:title="@string/prefs_block_potentially_offensive_title" + android:summary="@string/prefs_block_potentially_offensive_summary" + android:persistent="true" + android:defaultValue="@bool/config_block_potentially_offensive" /> <ListPreference android:key="auto_correction_threshold" android:title="@string/auto_correction" |