Merge "Make lock screen menu button actions work regardless of rebinding" into cm-10.2 (71cb1415) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -2409,7 +2409,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// Hijack modified menu keys for debugging features
		final int chordBug = KeyEvent.META_SHIFT_ON;

		if (virtualKey) {
		if (virtualKey \|\| keyguardOn) {
		// Let the app handle the key
		return 0;
		}
		@@ -2442,7 +2442,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return -1;
		}
		} else if (longPress) {
		if (!keyguardOn && mLongPressOnMenuBehavior != KEY_ACTION_NOTHING) {
		if (mLongPressOnMenuBehavior != KEY_ACTION_NOTHING) {
		if (mLongPressOnMenuBehavior != KEY_ACTION_APP_SWITCH) {
		cancelPreloadRecentApps();
		}
		@@ -2460,7 +2460,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (mPressOnMenuBehavior != KEY_ACTION_APP_SWITCH) {
		cancelPreloadRecentApps();
		}
		if (!canceled && !keyguardOn) {
		if (!canceled) {
		performKeyAction(mPressOnMenuBehavior);
		}
		}