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

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

am 002e43ea: Merge "Remove irrelevant options." into jb-dev 

* commit '002e43ea':
  Remove irrelevant options.
parents de1d88eb 002e43ea

java/res/xml/prefs.xml

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 
                android:defaultValue="true" />

            <CheckBoxPreference

                android:key="next_word_prediction"

                android:dependency="next_word_suggestion"

                android:title="@string/bigram_prediction"

                android:summary="@string/bigram_prediction_summary"

                android:persistent="true"

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

+5 −2
Original line number Diff line number Diff line
@@ -149,10 +149,13 @@ public class Settings extends InputMethodSettingsFragment 
            generalSettings.removePreference(mVoicePreference);

        }



        if (!VibratorUtils.getInstance(context).hasVibrator()) {

            generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));

        final PreferenceGroup advancedSettings =

                (PreferenceGroup) findPreference(PREF_ADVANCED_SETTINGS);

        // Remove those meaningless options for now. TODO: delete them for good

        advancedSettings.removePreference(findPreference(PREF_BIGRAM_SUGGESTION));

        advancedSettings.removePreference(findPreference(PREF_KEY_ENABLE_SPAN_INSERT));

        if (!VibratorUtils.getInstance(context).hasVibrator()) {

            generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));

            if (null != advancedSettings) { // Theoretically advancedSettings cannot be null

                advancedSettings.removePreference(findPreference(PREF_VIBRATION_DURATION_SETTINGS));

            }

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

+4 −9
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ public class SettingsValues { 
                && isBigramSuggestionEnabled(prefs, res, mAutoCorrectEnabled);

        mBigramPredictionEnabled = mBigramSuggestionEnabled

                && isBigramPredictionEnabled(prefs, res);

        mEnableSuggestionSpanInsertion =

                prefs.getBoolean(Settings.PREF_KEY_ENABLE_SPAN_INSERT, true);

        // TODO: remove mEnableSuggestionSpanInsertion. It's always true.

        mEnableSuggestionSpanInsertion = true;

        mVibrationDurationSettingsRawValue =

                prefs.getInt(Settings.PREF_VIBRATION_DURATION_SETTINGS, -1);

        mKeypressSoundVolumeRawValue = prefs.getFloat(Settings.PREF_KEYPRESS_SOUND_VOLUME, -1.0f);
@@ -242,13 +242,8 @@ public class SettingsValues { 


    private static boolean isBigramSuggestionEnabled(final SharedPreferences sp,

            final Resources resources, final boolean autoCorrectEnabled) {

        final boolean showBigramSuggestionsOption = resources.getBoolean(

                R.bool.config_enable_next_word_suggestions_option);

        if (!showBigramSuggestionsOption) {

            return autoCorrectEnabled;

        }

        return sp.getBoolean(Settings.PREF_BIGRAM_SUGGESTION, resources.getBoolean(

                R.bool.config_default_next_word_suggestions));

        // TODO: remove this method. Bigram suggestion is always true.

        return true;

    }



    private static boolean isBigramPredictionEnabled(final SharedPreferences sp,