Merge "Handle Home shortcut in PhoneWindowManager and back in native" into udc-dev (5ed761ef) · Commits · e / os / android_frameworks_base

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

+1 −14

Original line number	Diff line number	Diff line
		@@ -2977,7 +2977,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		break;
		case KeyEvent.KEYCODE_H:
		if (down && event.isMetaPressed()) {
		if (event.isMetaPressed()) {
		return handleHomeShortcuts(displayId, focusedToken, event);
		}
		break;
		@@ -3018,11 +3018,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (down && event.isMetaPressed() && event.isCtrlPressed() && repeatCount == 0) {
		enterStageSplitFromRunningApp(true /* leftOrTop */);
		return key_consumed;
		} else if (!down && event.isMetaPressed()) {
		boolean backKeyHandled = backKeyPress();
		if (backKeyHandled) {
		return key_consumed;
		}
		}
		break;
		case KeyEvent.KEYCODE_DPAD_RIGHT:
		@@ -3031,14 +3026,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return key_consumed;
		}
		break;
		case KeyEvent.KEYCODE_GRAVE:
		if (!down && event.isMetaPressed()) {
		boolean backKeyHandled = backKeyPress();
		if (backKeyHandled) {
		return key_consumed;
		}
		}
		break;
		case KeyEvent.KEYCODE_SLASH:
		if (down && repeatCount == 0 && event.isMetaPressed() && !keyguardOn) {
		toggleKeyboardShortcutsMenu(event.getDeviceId());