diff options
| author | Michael Wright <michaelwr@google.com> | 2014-08-09 20:41:33 -0700 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2014-08-11 13:02:09 -0700 |
| commit | 572f90bdf8183e42c522fdf041b20b064ffc8549 (patch) | |
| tree | de5dbd60631cd5690e2cffb16b3a53d2a841182a | |
| parent | 02d501433dd58df1c2cdc2dd60599b7fca1a242a (diff) | |
| download | packages_apps_Settings-572f90bdf8183e42c522fdf041b20b064ffc8549.zip packages_apps_Settings-572f90bdf8183e42c522fdf041b20b064ffc8549.tar.gz packages_apps_Settings-572f90bdf8183e42c522fdf041b20b064ffc8549.tar.bz2 | |
Remove non-functional hardware keyboard options.
Bug: 16027438
Bug: 16486654
Change-Id: Ia53d5d98c05586bbbd232519d8094706877ecaaf
| -rw-r--r-- | res/xml/language_settings.xml | 28 | ||||
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | 27 |
2 files changed, 0 insertions, 55 deletions
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml index 9d12857..b60dc5e 100644 --- a/res/xml/language_settings.xml +++ b/res/xml/language_settings.xml @@ -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 diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index ced6350..b8ae493 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -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); |