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

Commit 572f90bd authored by Michael Wright's avatar Michael Wright
Browse files

Remove non-functional hardware keyboard options. 

Bug: 16027438
Bug: 16486654
Change-Id: Ia53d5d98c05586bbbd232519d8094706877ecaaf
parent 02d50143

res/xml/language_settings.xml

+0 −28
Original line number Diff line number Diff line
@@ -65,34 +65,6 @@ 
            android:persistent="false">

        <!-- Additional preference screens are inserted here programmatically

             with low order values to set the key map of each attached keyboard. -->



        <CheckBoxPreference

                android:key="auto_replace"

                android:title="@string/auto_replace"

                android:summaryOn="@string/auto_replace_summary"

                android:summaryOff="@string/auto_replace_summary"

                android:order="1000"

                android:persistent="false"

                />



        <CheckBoxPreference

                android:key="auto_caps"

                android:title="@string/auto_caps"

                android:summaryOn="@string/auto_caps_summary"

                android:summaryOff="@string/auto_caps_summary"

                android:order="1001"

                android:persistent="false"

                />



        <CheckBoxPreference

                android:key="auto_punctuate"

                android:title="@string/auto_punctuate"

                android:summaryOn="@string/auto_punctuate_summary"

                android:summaryOff="@string/auto_punctuate_summary"

                android:order="1002"

                android:persistent="false"

                />



    </PreferenceCategory>



    <PreferenceCategory

src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

+0 −27
Original line number Diff line number Diff line
@@ -88,14 +88,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 
    // false: on ICS or later

    private static final boolean SHOW_INPUT_METHOD_SWITCHER_SETTINGS = false;



    private static final String[] sSystemSettingNames = {

        System.TEXT_AUTO_REPLACE, System.TEXT_AUTO_CAPS, System.TEXT_AUTO_PUNCTUATE,

    };



    private static final String[] sHardKeyboardKeys = {

        "auto_replace", "auto_caps", "auto_punctuate",

    };



    private int mDefaultInputMethodSelectorVisibility = 0;

    private ListPreference mShowInputMethodSelectorPref;

    private PreferenceCategory mKeyboardSettingsCategory;
@@ -274,16 +266,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 
            }

        }



        // Hard keyboard

        if (!mHardKeyboardPreferenceList.isEmpty()) {

            for (int i = 0; i < sHardKeyboardKeys.length; ++i) {

                CheckBoxPreference chkPref = (CheckBoxPreference)

                        mHardKeyboardCategory.findPreference(sHardKeyboardKeys[i]);

                chkPref.setChecked(

                        System.getInt(getContentResolver(), sSystemSettingNames[i], 1) > 0);

            }

        }



        updateInputDevices();



        // Refresh internal states in mInputMethodSettingValues to keep the latest
@@ -339,15 +321,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 
            }

        } else if (preference instanceof CheckBoxPreference) {

            final CheckBoxPreference chkPref = (CheckBoxPreference) preference;

            if (!mHardKeyboardPreferenceList.isEmpty()) {

                for (int i = 0; i < sHardKeyboardKeys.length; ++i) {

                    if (chkPref == mHardKeyboardCategory.findPreference(sHardKeyboardKeys[i])) {

                        System.putInt(getContentResolver(), sSystemSettingNames[i],

                                chkPref.isChecked() ? 1 : 0);

                        return true;

                    }

                }

            }

            if (chkPref == mGameControllerCategory.findPreference("vibrate_input_devices")) {

                System.putInt(getContentResolver(), Settings.System.VIBRATE_INPUT_DEVICES,

                        chkPref.isChecked() ? 1 : 0);