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

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

Make the keyboard sound on by default for xlarge screens. 

Also change the name of the default value for re-correction for
consistency with other constant names.

Bug: 3426884

Change-Id: I615ba640fb17e6d7514b8a0e4f52028eb0e23908
parent cf675cc8

java/res/values-xlarge/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
    <bool name="config_digit_popup_characters_enabled">false</bool>

    <!-- Whether or not Popup on key press is enabled by default -->

    <bool name="config_default_popup_preview">false</bool>

    <bool name="config_default_sound_enabled">true</bool>

    <bool name="config_use_spacebar_language_switcher">false</bool>

    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->

    <bool name="config_show_mini_keyboard_at_touched_point">true</bool>

java/res/values/config.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


<resources>

    <bool name="config_swipeDisambiguation">true</bool>

    <bool name="default_recorrection_enabled">true</bool>

    <bool name="config_long_press_comma_for_settings_enabled">true</bool>

    <bool name="config_enable_show_settings_key_option">true</bool>

    <bool name="config_enable_show_subtype_settings">true</bool>
@@ -39,6 +38,8 @@ 
    <!-- Default values for whether quick fixes and bigram suggestions are activated -->

    <bool name="config_default_quick_fixes">true</bool>

    <bool name="config_default_bigram_suggestions">true</bool>

    <bool name="config_default_recorrection_enabled">true</bool>

    <bool name="config_default_sound_enabled">false</bool>

    <bool name="config_use_spacebar_language_switcher">true</bool>

    <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->

    <bool name="config_show_mini_keyboard_at_touched_point">false</bool>

java/res/xml/prefs.xml

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
        <CheckBoxPreference

                android:key="sound_on"

                android:title="@string/sound_on_keypress"

                android:defaultValue="@bool/config_default_sound_enabled"

                android:persistent="true"

                />
@@ -53,7 +54,7 @@ 
                android:title="@string/prefs_enable_recorrection"

                android:summary="@string/prefs_enable_recorrection_summary"

                android:persistent="true"

                android:defaultValue="@bool/default_recorrection_enabled"

                android:defaultValue="@bool/config_default_recorrection_enabled"

                />



        <ListPreference

java/src/com/android/inputmethod/latin/LatinIME.java

+5 −4
Original line number Diff line number Diff line
@@ -359,9 +359,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        // but always use the default setting defined in the resources.

        if (res.getBoolean(R.bool.config_enable_show_recorrection_option)) {

            mReCorrectionEnabled = prefs.getBoolean(Settings.PREF_RECORRECTION_ENABLED,

                    res.getBoolean(R.bool.default_recorrection_enabled));

                    res.getBoolean(R.bool.config_default_recorrection_enabled));

        } else {

            mReCorrectionEnabled = res.getBoolean(R.bool.default_recorrection_enabled);

            mReCorrectionEnabled = res.getBoolean(R.bool.config_default_recorrection_enabled);

        }



        mConfigEnableShowSubtypeSettings = res.getBoolean(
@@ -1950,7 +1950,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        } else if (Settings.PREF_RECORRECTION_ENABLED.equals(key)) {

            mReCorrectionEnabled = sharedPreferences.getBoolean(

                    Settings.PREF_RECORRECTION_ENABLED,

                    mResources.getBoolean(R.bool.default_recorrection_enabled));

                    mResources.getBoolean(R.bool.config_default_recorrection_enabled));

        }

    }
@@ -2121,7 +2121,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);

        mVibrateOn = vibrator != null && vibrator.hasVibrator()

                && prefs.getBoolean(Settings.PREF_VIBRATE_ON, false);

        mSoundOn = prefs.getBoolean(Settings.PREF_SOUND_ON, false);

        mSoundOn = prefs.getBoolean(Settings.PREF_SOUND_ON,

                mResources.getBoolean(R.bool.config_default_sound_enabled));



        mPopupOn = isPopupEnabled(prefs);

        mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true);