From 6207c8769fa77a0cb0c36aec4f7197c8ff9a43e7 Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Mon, 21 Mar 2016 16:30:52 +0100 Subject: [PATCH] Settings: Respect config_proximityCheckOnWakeEnabledByDefault Also, set the correct value for PROXIMITY_ON_WAKE when the feature is disabled. Change-Id: Ibf9dd1c64aeb076bc72f328d50825790aef2a50b --- src/com/android/settings/DisplaySettings.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 399e1eb6fd..97353a80ac 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -294,7 +294,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements if (displayPrefs != null && mProximityCheckOnWakePreference != null) { displayPrefs.removePreference(mProximityCheckOnWakePreference); } - CMSettings.System.putInt(getContentResolver(), CMSettings.System.PROXIMITY_ON_WAKE, 1); + CMSettings.System.putInt(getContentResolver(), CMSettings.System.PROXIMITY_ON_WAKE, 0); + } else { + boolean proximityCheckOnWakeDefault = getResources().getBoolean( + org.cyanogenmod.platform.internal.R.bool.config_proximityCheckOnWakeEnabledByDefault); + mProximityCheckOnWakePreference.setChecked(CMSettings.System.getInt(getContentResolver(), + CMSettings.System.PROXIMITY_ON_WAKE, + (proximityCheckOnWakeDefault ? 1 : 0)) == 1); } mWakeWhenPluggedOrUnplugged = -- 2.11.0