Port: Wake on plug (2/2) (e0c17471) · Commits · e / os / android_packages_apps_Settings

res/values/cm_strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -413,4 +413,8 @@
		<!-- Proximity wake -->
		<string name="proximity_wake_title">Prevent accidental wake-up</string>
		<string name="proximity_wake_summary">Check the proximity sensor prior to waking up screen</string>

		<!-- Turn on display when power connected; turn off display when power disconnected -->
		<string name="wake_when_plugged_or_unplugged_title">Wake on plug</string>
		<string name="wake_when_plugged_or_unplugged_summary">Turn the screen on when connecting or disconnecting a power source</string>
		</resources>

res/xml/display_settings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -116,5 +116,11 @@
		android:title="@string/double_tap_to_sleep_title"
		android:summary="@string/double_tap_to_sleep_summary"
		android:defaultValue="true" />

		<SwitchPreference
		android:key="wake_when_plugged_or_unplugged"
		android:title="@string/wake_when_plugged_or_unplugged_title"
		android:summary="@string/wake_when_plugged_or_unplugged_summary"
		android:defaultValue="false" />
		</PreferenceCategory>
		</PreferenceScreen>

src/com/android/settings/DisplaySettings.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		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 KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED = "wake_when_plugged_or_unplugged";

		private static final String CATEGORY_ADVANCED = "advanced_display_prefs";

		@@ -99,6 +100,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		private SwitchPreference mTapToWakePreference;
		private SwitchPreference mAutoBrightnessPreference;
		private SwitchPreference mTapToWake;
		private SwitchPreference mWakeWhenPluggedOrUnplugged;

		@Override
		protected int getMetricsCategory() {
		@@ -220,6 +222,9 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		advancedPrefs.removePreference(findPreference(KEY_PROXIMITY_WAKE));
		Settings.System.putInt(getContentResolver(), Settings.System.PROXIMITY_ON_WAKE, 1);
		}

		mWakeWhenPluggedOrUnplugged =
		(SwitchPreference) findPreference(KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED);
		}

		private static boolean allowAllRotations(Context context) {
		@@ -346,6 +351,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		mTapToWake.setChecked(TapToWake.isEnabled());
		}

		// Default value for wake-on-plug behavior from config.xml
		boolean wakeUpWhenPluggedOrUnpluggedConfig = getResources().getBoolean(
		com.android.internal.R.bool.config_unplugTurnsOnScreen);

		mWakeWhenPluggedOrUnplugged.setChecked(Settings.Global.getInt(getContentResolver(),
		Settings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED,
		(wakeUpWhenPluggedOrUnpluggedConfig ? 1 : 0)) == 1);

		updateState();
		}

		@@ -422,6 +435,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
		public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
		if (preference == mTapToWake) {
		return TapToWake.setEnabled(mTapToWake.isChecked());
		} else if (preference == mWakeWhenPluggedOrUnplugged) {
		Settings.Global.putInt(getContentResolver(),
		Settings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED,
		mWakeWhenPluggedOrUnplugged.isChecked() ? 1 : 0);
		return true;
		}

		return super.onPreferenceTreeClick(preferenceScreen, preference);