summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DisplaySettings.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
-rw-r--r--src/com/android/settings/DisplaySettings.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 392e44d..ff2aad2 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -81,6 +81,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private static final String KEY_AUTO_ROTATE = "auto_rotate";
private static final String KEY_NIGHT_MODE = "night_mode";
private static final String KEY_TAP_TO_WAKE = "double_tap_wake_gesture";
+ private static final String KEY_PROXIMITY_WAKE = "proximity_on_wake";
private static final String CATEGORY_ADVANCED = "advanced_display_prefs";
@@ -212,6 +213,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
advancedPrefs.removePreference(mTapToWake);
mTapToWake = null;
}
+
+ boolean proximityCheckOnWait = getResources().getBoolean(
+ com.android.internal.R.bool.config_proximityCheckOnWake);
+ if (!proximityCheckOnWait) {
+ advancedPrefs.removePreference(findPreference(KEY_PROXIMITY_WAKE));
+ Settings.System.putInt(getContentResolver(), Settings.System.PROXIMITY_ON_WAKE, 1);
+ }
}
private static boolean allowAllRotations(Context context) {