diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-05-15 11:05:06 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 11:05:06 -0700 |
| commit | 926abffaaa122b96962e24f9f10c10c43d7c4114 (patch) | |
| tree | 966620105b27d308fe5e6f9993042f1d75c31ca3 | |
| parent | 3160671bc197109e83d2b70be29bc26d39b78375 (diff) | |
| parent | 42abed7ff30b4ad4c04407a81db8de86244b1d80 (diff) | |
| download | latinime-926abffaaa122b96962e24f9f10c10c43d7c4114.tar.gz latinime-926abffaaa122b96962e24f9f10c10c43d7c4114.tar.xz latinime-926abffaaa122b96962e24f9f10c10c43d7c4114.zip | |
am 42abed7f: am 9a98ef69: Merge "[ZF3] Add the option to block potentially offensive words"
* commit '42abed7ff30b4ad4c04407a81db8de86244b1d80':
[ZF3] Add the option to block potentially offensive words
| -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 6773f4013..deaa388fb 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" |