diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index 6288fb2..bc50d4f 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -90,11 +90,14 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment private static final String KEY_TRACKPAD_SETTINGS = "gesture_pad_settings"; private static final String KEY_HIGH_TOUCH_SENSITIVITY = "high_touch_sensitivity"; private static final String KEY_STYLUS_GESTURES = "stylus_gestures"; + private static final String KEY_STYLUS_ICON_ENABLED = "stylus_icon_enabled"; + // false: on ICS or later private static final boolean SHOW_INPUT_METHOD_SWITCHER_SETTINGS = false; private int mDefaultInputMethodSelectorVisibility = 0; private ListPreference mShowInputMethodSelectorPref; + private SwitchPreference mStylusIconEnabled; private SwitchPreference mHighTouchSensitivity; private PreferenceCategory mKeyboardSettingsCategory; private PreferenceCategory mHardKeyboardCategory; @@ -178,11 +181,13 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment findPreference(KEY_POINTER_SETTINGS_CATEGORY); mStylusGestures = (PreferenceScreen) findPreference(KEY_STYLUS_GESTURES); + mStylusIconEnabled = (SwitchPreference) findPreference(KEY_STYLUS_ICON_ENABLED); mHighTouchSensitivity = (SwitchPreference) findPreference(KEY_HIGH_TOUCH_SENSITIVITY); if (pointerSettingsCategory != null) { if (!getResources().getBoolean(com.android.internal.R.bool.config_stylusGestures)) { pointerSettingsCategory.removePreference(mStylusGestures); + pointerSettingsCategory.removePreference(mStylusIconEnabled); } if (!isHighTouchSensitivitySupported()) { @@ -304,6 +309,11 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment } } + if (mStylusIconEnabled != null) { + mStylusIconEnabled.setChecked(Settings.System.getInt(getActivity().getContentResolver(), + Settings.System.STYLUS_ICON_ENABLED, 0) == 1); + } + if (!mShowsOnlyFullImeAndKeyboardList) { if (mLanguagePref != null) { String localeName = getLocaleName(getActivity()); @@ -361,7 +371,10 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment if (Utils.isMonkeyRunning()) { return false; } - if (preference instanceof PreferenceScreen) { + if (preference == mStylusIconEnabled) { + Settings.System.putInt(getActivity().getContentResolver(), + Settings.System.STYLUS_ICON_ENABLED, mStylusIconEnabled.isChecked() ? 1 : 0); + } else if (preference instanceof PreferenceScreen) { if (preference.getFragment() != null) { // Fragment will be handled correctly by the super class. } else if (KEY_CURRENT_INPUT_METHOD.equals(preference.getKey())) { |