diff options
| author | LuK1337 <priv.luk@gmail.com> | 2015-12-11 19:58:26 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-12-12 03:54:44 -0800 |
| commit | ff606ac047d77416dbcc361ddd90551b3791076c (patch) | |
| tree | bd4a9ecdda45a3b63022c1644c72835542b2f3a2 /src/com/android | |
| parent | 88970d8eba72a68a88083f4ea8eda827ed618118 (diff) | |
| download | packages_apps_Settings-ff606ac047d77416dbcc361ddd90551b3791076c.zip packages_apps_Settings-ff606ac047d77416dbcc361ddd90551b3791076c.tar.gz packages_apps_Settings-ff606ac047d77416dbcc361ddd90551b3791076c.tar.bz2 | |
DisplaySettings: Remove device dependent prefs properly
* Old way doesn't seem to work thus we have unnecessary prefs
on devices without those features.
Change-Id: I7fca5178949134cc08274d014843a4e6b1579731
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index f651ead..81d6418 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -260,19 +260,24 @@ public class DisplaySettings extends SettingsPreferenceFragment implements } } - if (isCameraGestureAvailable(getResources())) { - mCameraGesturePreference = (SwitchPreference) findPreference(KEY_CAMERA_GESTURE); + mCameraGesturePreference = (SwitchPreference) findPreference(KEY_CAMERA_GESTURE); + if (mCameraGesturePreference != null && isCameraGestureAvailable(getResources())) { mCameraGesturePreference.setOnPreferenceChangeListener(this); } else { - removePreference(KEY_CAMERA_GESTURE); + if (displayPrefs != null && mCameraGesturePreference != null) { + displayPrefs.removePreference(mCameraGesturePreference); + } } - if (isCameraDoubleTapPowerGestureAvailable(getResources())) { - mCameraDoubleTapPowerGesturePreference - = (SwitchPreference) findPreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE); + mCameraDoubleTapPowerGesturePreference = + (SwitchPreference) findPreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE); + if (mCameraDoubleTapPowerGesturePreference != null && + isCameraDoubleTapPowerGestureAvailable(getResources())) { mCameraDoubleTapPowerGesturePreference.setOnPreferenceChangeListener(this); } else { - removePreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE); + if (displayPrefs != null && mCameraDoubleTapPowerGesturePreference != null) { + displayPrefs.removePreference(mCameraDoubleTapPowerGesturePreference); + } } mNightModePreference = (ListPreference) findPreference(KEY_NIGHT_MODE); @@ -288,13 +293,19 @@ public class DisplaySettings extends SettingsPreferenceFragment implements if (mTapToWakePreference != null && isTapToWakeAvailable(getResources())) { mTapToWakePreference.setOnPreferenceChangeListener(this); } else { - removePreference(KEY_TAP_TO_WAKE); + if (displayPrefs != null && mTapToWakePreference != null) { + displayPrefs.removePreference(mTapToWakePreference); + } } boolean proximityCheckOnWait = getResources().getBoolean( org.cyanogenmod.platform.internal.R.bool.config_proximityCheckOnWake); if (!proximityCheckOnWait) { - removePreference(KEY_PROXIMITY_WAKE); + SwitchPreference mProximityWakePreference = + (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE); + if (displayPrefs != null && mProximityWakePreference != null) { + displayPrefs.removePreference(mProximityWakePreference); + } CMSettings.System.putInt(getContentResolver(), CMSettings.System.PROXIMITY_ON_WAKE, 1); } |