Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1 (88089ccc) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -830,12 +830,13 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		* action should be posted to a handler.
		*
		* @param keyCode The keycode of the key that woke the device
		* @param isDocked True if the device is in the dock
		* @return Whether we poked the wake lock (and turned the screen on)
		*/
		public boolean onWakeKeyWhenKeyguardShowingTq(int keyCode) {
		public boolean onWakeKeyWhenKeyguardShowingTq(int keyCode, boolean isDocked) {
		if (DEBUG) Log.d(TAG, "onWakeKeyWhenKeyguardShowing(" + keyCode + ")");

		if (isWakeKeyWhenKeyguardShowing(keyCode)) {
		if (isWakeKeyWhenKeyguardShowing(keyCode, isDocked)) {
		// give the keyguard view manager a chance to adjust the state of the
		// keyguard based on the key that woke the device before poking
		// the wake lock
		@@ -846,11 +847,22 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		}
		}

		private boolean isWakeKeyWhenKeyguardShowing(int keyCode) {
		/**
		* When the keyguard is showing we ignore some keys that might otherwise typically
		* be considered wake keys. We filter them out here.
		*
		* {@link KeyEvent#KEYCODE_POWER} is notably absent from this list because it
		* is always considered a wake key.
		*/
		private boolean isWakeKeyWhenKeyguardShowing(int keyCode, boolean isDocked) {
		switch (keyCode) {
		// ignore volume keys unless docked
		case KeyEvent.KEYCODE_VOLUME_UP:
		case KeyEvent.KEYCODE_VOLUME_DOWN:
		case KeyEvent.KEYCODE_VOLUME_MUTE:
		return isDocked;

		// ignore media and camera keys
		case KeyEvent.KEYCODE_MUTE:
		case KeyEvent.KEYCODE_HEADSETHOOK:
		case KeyEvent.KEYCODE_MEDIA_PLAY:

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -2486,7 +2486,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// keyguard, then we need to have it turn on the
		// screen once it is shown.
		mKeyguardMediator.onWakeKeyWhenKeyguardShowingTq(
		KeyEvent.KEYCODE_POWER);
		KeyEvent.KEYCODE_POWER, mDockMode != Intent.EXTRA_DOCK_STATE_UNDOCKED);
		}
		} else {
		// Light up the keyboard if we are sliding up.
		@@ -2706,7 +2706,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (down && isWakeKey) {
		if (keyguardActive) {
		// If the keyguard is showing, let it decide what to do with the wake key.
		mKeyguardMediator.onWakeKeyWhenKeyguardShowingTq(keyCode);
		mKeyguardMediator.onWakeKeyWhenKeyguardShowingTq(keyCode,
		mDockMode != Intent.EXTRA_DOCK_STATE_UNDOCKED);
		} else {
		// Otherwise, wake the device ourselves.
		result \|= ACTION_POKE_USER_ACTIVITY;