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

Commit ce9c4171 authored by Jean Chalard's avatar Jean Chalard
Browse files

Change separator titles in settings screen.

Add a "General" category to enclose general settings, and rename
"Word suggestion settings" to "Text correction".

bug: 3282448

Change-Id: Ie695683af0646974da82e29e11d1c3a785ef46c7
parent ce4b2d2d
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -34,8 +34,11 @@
    <!-- Option to control whether or not to show a popup with a larger font on each key press. -->
    <string name="popup_on_keypress">Popup on keypress</string>

    <!-- Category title for general settings for Android keyboard -->
    <string name="general_category">General</string>

    <!-- Category title for text prediction -->
    <string name="prediction_category">Word suggestion settings</string>
    <string name="prediction_category">Text correction</string>

    <!-- Option to enable auto capitalization of sentences -->
    <string name="auto_cap">Auto-capitalization</string>
@@ -46,7 +49,7 @@
    <string name="quick_fixes_summary">Corrects commonly typed mistakes</string>

    <!-- Option to enable showing suggestions -->
    <string name="prefs_show_suggestions">Show suggestions</string>
    <string name="prefs_show_suggestions">Show correction suggestions</string>
    <!-- Description for show suggestions -->
    <string name="prefs_show_suggestions_summary">Display suggested words while typing</string>
    <string name="prefs_suggestion_visibility_show_name">Always show</string>
+57 −51
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@
        android:title="@string/english_ime_settings"
        android:key="english_ime_settings">

    <PreferenceCategory
            android:title="@string/general_category"
            android:key="general_settings">

        <CheckBoxPreference
                android:key="auto_cap"
                android:title="@string/auto_cap"
@@ -75,6 +79,8 @@
                android:title="@string/language_selection_title"
                android:summary="@string/language_selection_summary" />

    </PreferenceCategory>

    <PreferenceCategory
            android:title="@string/prediction_category"
            android:key="prediction_settings">
+10 −7
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class Settings extends PreferenceActivity
        DialogInterface.OnDismissListener, OnPreferenceClickListener {
    private static final String TAG = "Settings";

    public static final String PREF_GENERAL_SETTINGS_KEY = "general_settings";
    public static final String PREF_VIBRATE_ON = "vibrate_on";
    public static final String PREF_SOUND_ON = "sound_on";
    public static final String PREF_POPUP_ON = "popup_on";
@@ -111,40 +112,42 @@ public class Settings extends PreferenceActivity
        mBigramSuggestion = (CheckBoxPreference) findPreference(PREF_BIGRAM_SUGGESTIONS);
        ensureConsistencyOfAutoCorrectionSettings();

        final PreferenceGroup generalSettings =
	        (PreferenceGroup) findPreference(PREF_GENERAL_SETTINGS_KEY);

        final boolean showSettingsKeyOption = getResources().getBoolean(
                R.bool.config_enable_show_settings_key_option);
        if (!showSettingsKeyOption) {
            getPreferenceScreen().removePreference(mSettingsKeyPreference);
            generalSettings.removePreference(mSettingsKeyPreference);
        }

        final boolean showVoiceKeyOption = getResources().getBoolean(
                R.bool.config_enable_show_voice_key_option);
        if (!showVoiceKeyOption) {
            getPreferenceScreen().removePreference(mVoicePreference);
            generalSettings.removePreference(mVoicePreference);
        }

        Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
        if (vibrator == null || !vibrator.hasVibrator()) {
            getPreferenceScreen().removePreference(
                    getPreferenceScreen().findPreference(PREF_VIBRATE_ON));
            generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));
        }

        final boolean showSubtypeSettings = getResources().getBoolean(
                R.bool.config_enable_show_subtype_settings);
        if (!showSubtypeSettings) {
            getPreferenceScreen().removePreference(findPreference(PREF_SUBTYPES));
            generalSettings.removePreference(findPreference(PREF_SUBTYPES));
        }

        final boolean showPopupOption = getResources().getBoolean(
                R.bool.config_enable_show_popup_on_keypress_option);
        if (!showPopupOption) {
            getPreferenceScreen().removePreference(findPreference(PREF_POPUP_ON));
            generalSettings.removePreference(findPreference(PREF_POPUP_ON));
        }

        final boolean showRecorrectionOption = getResources().getBoolean(
                R.bool.config_enable_show_recorrection_option);
        if (!showRecorrectionOption) {
            getPreferenceScreen().removePreference(findPreference(PREF_RECORRECTION_ENABLED));
            generalSettings.removePreference(findPreference(PREF_RECORRECTION_ENABLED));
        }
    }