Settings: obey prevent accidental wakeup default (c7659093) · Commits · e / os / android_packages_apps_Settings

res/xml/display.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -84,11 +84,10 @@
		android:defaultValue="true" />

		<!-- Prevent accidental wake-up -->
		<com.android.settings.cyanogenmod.SystemSettingSwitchPreference
		<SwitchPreference
		android:key="proximity_on_wake"
		android:title="@string/proximity_wake_title"
		android:summary="@string/proximity_wake_summary"
		android:defaultValue="true"
		settings:advanced="true"/>

		<!-- Seconds before sleep -->

src/com/android/settings/DisplaySettings.java

+23 −4

Original line number	Diff line number	Diff line
		@@ -121,6 +121,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		private SwitchPreference mAutoBrightnessPreference;
		private SwitchPreference mTapToWake;
		private SwitchPreference mWakeWhenPluggedOrUnplugged;
		private SwitchPreference mProximityWakePreference;

		private CMHardwareManager mHardware;

		@@ -252,13 +253,17 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		mTapToWake = null;
		}

		Preference proximityWake = findPreference(KEY_PROXIMITY_WAKE);
		mProximityWakePreference = (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE);
		boolean proximityCheckOnWake = getResources().getBoolean(
		com.android.internal.R.bool.config_proximityCheckOnWake);
		if (displayPrefs != null && proximityWake != null && !proximityCheckOnWake) {
		displayPrefs.removePreference(proximityWake);
		if (mProximityWakePreference != null && proximityCheckOnWake) {
		mProximityWakePreference.setOnPreferenceChangeListener(this);
		} else {
		if (displayPrefs != null && mProximityWakePreference != null) {
		displayPrefs.removePreference(mProximityWakePreference);
		Settings.System.putInt(getContentResolver(), Settings.System.PROXIMITY_ON_WAKE, 0);
		}
		}

		mWakeWhenPluggedOrUnplugged =
		(SwitchPreference) findPreference(KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED);
		@@ -509,6 +514,15 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		int value = Settings.Secure.getInt(getContentResolver(), DOZE_ENABLED, 1);
		mDozePreference.setChecked(value != 0);
		}

		// Update proximity wake if it is available.
		if (mProximityWakePreference != null) {
		boolean defaultValue = getResources().getBoolean(
		com.android.internal.R.bool.config_proximityCheckOnWakeEnabledByDefault);
		boolean enabled = Settings.System.getInt(getContentResolver(),
		Settings.System.PROXIMITY_ON_WAKE, defaultValue ? 1 : 0) == 1;
		mProximityWakePreference.setChecked(enabled);
		}
		}

		private void updateScreenSaverSummary() {
		@@ -655,6 +669,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		boolean value = (Boolean) objValue;
		Settings.Secure.putInt(getContentResolver(), DOZE_ENABLED, value ? 1 : 0);
		}
		if (preference == mProximityWakePreference) {
		boolean value = (Boolean) objValue;
		Settings.System.putInt(getContentResolver(), Settings.System.PROXIMITY_ON_WAKE,
		value ? 1 : 0);
		}
		return true;
		}