diff options
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 66f9136..718f03d 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -178,18 +178,24 @@ public class DisplaySettings extends SettingsPreferenceFragment implements mFontSizePref.setOnPreferenceChangeListener(this); mFontSizePref.setOnPreferenceClickListener(this); - if (isAutomaticBrightnessAvailable(getResources())) { - mAutoBrightnessPreference = (SwitchPreference) findPreference(KEY_AUTO_BRIGHTNESS); + mAutoBrightnessPreference = (SwitchPreference) findPreference(KEY_AUTO_BRIGHTNESS); + if (mAutoBrightnessPreference != null && isAutomaticBrightnessAvailable(getResources())) { mAutoBrightnessPreference.setOnPreferenceChangeListener(this); } else { - removePreference(KEY_AUTO_BRIGHTNESS); + if (displayPrefs != null && mAutoBrightnessPreference != null) { + displayPrefs.removePreference(mAutoBrightnessPreference); + mAutoBrightnessPreference = null; + } } - if (isLiftToWakeAvailable(activity)) { - mLiftToWakePreference = (SwitchPreference) findPreference(KEY_LIFT_TO_WAKE); + mLiftToWakePreference = (SwitchPreference) findPreference(KEY_LIFT_TO_WAKE); + if (mLiftToWakePreference != null && isLiftToWakeAvailable(activity)) { mLiftToWakePreference.setOnPreferenceChangeListener(this); } else { - removePreference(KEY_LIFT_TO_WAKE); + if (displayPrefs != null && mLiftToWakePreference != null) { + displayPrefs.removePreference(mLiftToWakePreference); + mLiftToWakePreference = null; + } } PreferenceCategory advancedPrefs = (PreferenceCategory) findPreference(CATEGORY_ADVANCED); |