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

Commit 83f4a986 authored by Jean Chalard's avatar Jean Chalard
Browse files

Cleanup, part 10 : remove from the code obsolete options (C10) 

Change-Id: Id0806ad3dc7ccb632713eebaca76f0bab26ece5d
parent e8bb8351

java/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -22,14 +22,10 @@ 
    <bool name="config_use_fullscreen_mode">false</bool>

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

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

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

    <!-- TODO: Disable the following configuration for production. -->

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

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

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

    <!-- Default value for next word suggestion: while showing suggestions for a word should we weigh

         in the previous word? -->

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

    <!-- Default value for next word prediction: after entering a word and a space only, should we look

         at input history to suggest a hopefully helpful suggestions for the next word? -->

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

java/res/xml/prefs.xml

+0 −12
Original line number Diff line number Diff line
@@ -114,24 +114,12 @@ 
                android:summary="@string/use_contacts_dict_summary"

                android:persistent="true"

                android:defaultValue="true" />

            <CheckBoxPreference

                android:key="next_word_suggestion"

                android:title="@string/bigram_suggestion"

                android:summary="@string/bigram_suggestion_summary"

                android:persistent="true"

                android:defaultValue="true" />

            <CheckBoxPreference

                android:key="next_word_prediction"

                android:title="@string/bigram_prediction"

                android:summary="@string/bigram_prediction_summary"

                android:persistent="true"

                android:defaultValue="true" />

            <CheckBoxPreference

                android:key="enable_span_insert"

                android:title="@string/enable_span_insert"

                android:summary="@string/enable_span_insert_summary"

                android:persistent="true"

                android:defaultValue="true" />

            <PreferenceScreen

                android:key="pref_vibration_duration_settings"

                android:title="@string/prefs_keypress_vibration_duration_settings"/>

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

+3 −21
Original line number Diff line number Diff line
@@ -69,9 +69,7 @@ public class Settings extends InputMethodSettingsFragment 
    public static final String PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY =

            "pref_key_preview_popup_dismiss_delay";

    public static final String PREF_KEY_USE_CONTACTS_DICT = "pref_key_use_contacts_dict";

    public static final String PREF_BIGRAM_SUGGESTION = "next_word_suggestion";

    public static final String PREF_BIGRAM_PREDICTIONS = "next_word_prediction";

    public static final String PREF_KEY_ENABLE_SPAN_INSERT = "enable_span_insert";

    public static final String PREF_VIBRATION_DURATION_SETTINGS =

            "pref_vibration_duration_settings";

    public static final String PREF_KEYPRESS_SOUND_VOLUME =
@@ -87,9 +85,7 @@ public class Settings extends InputMethodSettingsFragment 
    private ListPreference mShowCorrectionSuggestionsPreference;

    private ListPreference mAutoCorrectionThresholdPreference;

    private ListPreference mKeyPreviewPopupDismissDelay;

    // Suggestion: use bigrams to adjust scores of suggestions obtained from unigram dictionary

    private CheckBoxPreference mBigramSuggestion;

    // Prediction: use bigrams to predict the next word when there is no input for it yet

    // Use bigrams to predict the next word when there is no input for it yet

    private CheckBoxPreference mBigramPrediction;

    private Preference mDebugSettingsPreference;
@@ -100,7 +96,6 @@ public class Settings extends InputMethodSettingsFragment 
        final String autoCorrectionOff = getResources().getString(

                R.string.auto_correction_threshold_mode_index_off);

        final String currentSetting = mAutoCorrectionThresholdPreference.getValue();

        mBigramSuggestion.setEnabled(!currentSetting.equals(autoCorrectionOff));

        if (null != mBigramPrediction) {

            mBigramPrediction.setEnabled(!currentSetting.equals(autoCorrectionOff));

        }
@@ -124,7 +119,6 @@ public class Settings extends InputMethodSettingsFragment 


        mAutoCorrectionThresholdPreference =

                (ListPreference) findPreference(PREF_AUTO_CORRECTION_THRESHOLD);

        mBigramSuggestion = (CheckBoxPreference) findPreference(PREF_BIGRAM_SUGGESTION);

        mBigramPrediction = (CheckBoxPreference) findPreference(PREF_BIGRAM_PREDICTIONS);

        mDebugSettingsPreference = findPreference(PREF_DEBUG_SETTINGS);

        if (mDebugSettingsPreference != null) {
@@ -149,12 +143,9 @@ public class Settings extends InputMethodSettingsFragment 
            generalSettings.removePreference(mVoicePreference);

        }



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

            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));
@@ -167,15 +158,6 @@ public class Settings extends InputMethodSettingsFragment 
            generalSettings.removePreference(findPreference(PREF_POPUP_ON));

        }



        final boolean showBigramSuggestionsOption = res.getBoolean(

                R.bool.config_enable_next_word_suggestions_option);

        if (!showBigramSuggestionsOption) {

            textCorrectionGroup.removePreference(mBigramSuggestion);

            if (null != mBigramPrediction) {

                textCorrectionGroup.removePreference(mBigramPrediction);

            }

        }



        final CheckBoxPreference includeOtherImesInLanguageSwitchList =

                (CheckBoxPreference)findPreference(PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST);

        includeOtherImesInLanguageSwitchList.setEnabled(

tests/src/com/android/inputmethod/latin/PunctuationTests.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ public class PunctuationTests extends InputTestsBase { 
        final String PUNCTUATION_FROM_STRIP = "!";

        final String EXPECTED_RESULT = "this!! ";

        final boolean defaultNextWordPredictionOption =

                mLatinIME.getResources().getBoolean(R.bool.config_default_next_word_suggestions);

                mLatinIME.getResources().getBoolean(R.bool.config_default_next_word_prediction);

        final boolean previousNextWordPredictionOption =

                setBooleanPreference(NEXT_WORD_PREDICTION_OPTION, false,

                        defaultNextWordPredictionOption);