fw/base: allow home button to wake device [1/2] (f8dc549e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -505,6 +505,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		boolean mUseTvRouting;
		int mBackKillTimeout;

		// Behavior of home wake
		boolean mHomeWakeScreen;

		int mDeviceHardwareKeys;

		int mPointerLocationMode = 0; // guarded by mLock
		@@ -922,6 +925,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.VOLBTN_MUSIC_CONTROLS), false, this,
		UserHandle.USER_ALL);
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.HOME_WAKE_SCREEN), false, this,
		UserHandle.USER_ALL);

		updateSettings();
		}
		@@ -2153,6 +2159,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		UserHandle.USER_CURRENT);
		mVolBtnMusicControls = (Settings.System.getIntForUser(resolver,
		Settings.System.VOLBTN_MUSIC_CONTROLS, 1, UserHandle.USER_CURRENT) == 1);
		mHomeWakeScreen = (Settings.System.getIntForUser(resolver,
		Settings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1);

		// Configure wake gesture.
		boolean wakeGestureEnabledSetting = Settings.Secure.getIntForUser(resolver,
		@@ -6019,6 +6027,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		break;
		}

		case KeyEvent.KEYCODE_HOME:
		if (down && !interactive && mHomeWakeScreen) {
		isWakeKey = true;
		}
		break;

		case KeyEvent.KEYCODE_ENDCALL: {
		result &= ~ACTION_PASS_TO_USER;
		if (down) {