diff options
| author | AragaoAnderson <andersonaragao@me.com> | 2015-12-11 23:34:30 -0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-12-12 16:28:09 +0200 |
| commit | 3ac9e17f9069dca2d75f0e250a5e24e5c60c3c1d (patch) | |
| tree | 0a86193c4c749594e3eb9cddd64e3bbeae24ec45 /src/com/android/settings/DisplaySettings.java | |
| parent | 8658bb87d48cbc5f089455c207cf26a03bd1b39c (diff) | |
| download | packages_apps_Settings-3ac9e17f9069dca2d75f0e250a5e24e5c60c3c1d.zip packages_apps_Settings-3ac9e17f9069dca2d75f0e250a5e24e5c60c3c1d.tar.gz packages_apps_Settings-3ac9e17f9069dca2d75f0e250a5e24e5c60c3c1d.tar.bz2 | |
Settings: Fix more derps after reorganization from 12.1
* Move Wallpaper fragment to Interface category
* Use CMSystemSettingSwitchPreference for:
Prevent accidental wake-up
Search in Recents
Change-Id: I49b184e4c838bce916271aae9409bb65f7338788
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 81d6418..7139937 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -128,6 +128,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private SwitchPreference mLiftToWakePreference; private SwitchPreference mDozePreference; private SwitchPreference mTapToWakePreference; + private SwitchPreference mProximityCheckOnWakePreference; private SwitchPreference mAutoBrightnessPreference; private SwitchPreference mWakeWhenPluggedOrUnplugged; @@ -298,13 +299,12 @@ public class DisplaySettings extends SettingsPreferenceFragment implements } } - boolean proximityCheckOnWait = getResources().getBoolean( + mProximityCheckOnWakePreference = (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE); + boolean proximityCheckOnWake = getResources().getBoolean( org.cyanogenmod.platform.internal.R.bool.config_proximityCheckOnWake); - if (!proximityCheckOnWait) { - SwitchPreference mProximityWakePreference = - (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE); - if (displayPrefs != null && mProximityWakePreference != null) { - displayPrefs.removePreference(mProximityWakePreference); + if (!proximityCheckOnWake) { + if (displayPrefs != null && mProximityCheckOnWakePreference != null) { + displayPrefs.removePreference(mProximityCheckOnWakePreference); } CMSettings.System.putInt(getContentResolver(), CMSettings.System.PROXIMITY_ON_WAKE, 1); } |