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
main
Jean Chalard 2013-05-15 11:05:06 -07:00 committed by Android Git Automerger
commit 926abffaaa
2 changed files with 11 additions and 0 deletions

View File

@ -111,6 +111,11 @@
<string name="prefs_suggestion_visibility_show_only_portrait_name">Show in portrait mode</string> <string name="prefs_suggestion_visibility_show_only_portrait_name">Show in portrait mode</string>
<string name="prefs_suggestion_visibility_hide_name">Always hide</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 decide the auto correction threshold score -->
<!-- Option to enable auto correction [CHAR LIMIT=20]--> <!-- Option to enable auto correction [CHAR LIMIT=20]-->
<string name="auto_correction">Auto-correction</string> <string name="auto_correction">Auto-correction</string>

View File

@ -69,6 +69,12 @@
android:value="@string/dictionary_pack_client_id" /> android:value="@string/dictionary_pack_client_id" />
</intent> </intent>
</PreferenceScreen> </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 <ListPreference
android:key="auto_correction_threshold" android:key="auto_correction_threshold"
android:title="@string/auto_correction" android:title="@string/auto_correction"