summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 439efbc..b583d52 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -176,11 +176,18 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
findPreference(KEY_POINTER_SETTINGS_CATEGORY);
mHighTouchSensitivity = (SwitchPreference) findPreference(KEY_HIGH_TOUCH_SENSITIVITY);
- if (!isHighTouchSensitivitySupported()) {
- pointerSettingsCategory.removePreference(mHighTouchSensitivity);
- mHighTouchSensitivity = null;
- } else {
- mHighTouchSensitivity.setChecked(HighTouchSensitivity.isEnabled());
+
+ if (pointerSettingsCategory != null) {
+ if (!isHighTouchSensitivitySupported()) {
+ pointerSettingsCategory.removePreference(mHighTouchSensitivity);
+ mHighTouchSensitivity = null;
+ } else {
+ mHighTouchSensitivity.setChecked(HighTouchSensitivity.isEnabled());
+ }
+
+ if (pointerSettingsCategory.getPreferenceCount() == 0) {
+ getPreferenceScreen().removePreference(pointerSettingsCategory);
+ }
}
// Enable or disable mStatusBarImeSwitcher based on boolean: config_show_cmIMESwitcher