Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42abed7f authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 9a98ef69: Merge "[ZF3] Add the option to block potentially offensive words" 

* commit '9a98ef69':
  [ZF3] Add the option to block potentially offensive words
parents 330072b0 9a98ef69

java/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>

java/res/xml/prefs.xml

+6 −0
Original line number Diff line number Diff line
@@ -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"