Merge "Changed cluster kb navigation shortcut to meta+[shift]+tab" (df7f2835) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -4421,14 +4421,12 @@ public final class ViewRootImpl implements ViewParent,

		int groupNavigationDirection = 0;

		if (event.getAction() == KeyEvent.ACTION_DOWN && event.isCtrlPressed()) {
		final int character =
		event.getUnicodeChar(event.getMetaState() & ~KeyEvent.META_CTRL_MASK);
		if (character == '+') {
		if (event.getAction() == KeyEvent.ACTION_DOWN
		&& event.getKeyCode() == KeyEvent.KEYCODE_TAB) {
		if (KeyEvent.metaStateHasModifiers(event.getMetaState(), KeyEvent.META_META_ON)) {
		groupNavigationDirection = View.FOCUS_FORWARD;
		}

		if (character == '_') {
		} else if (KeyEvent.metaStateHasModifiers(event.getMetaState(),
		KeyEvent.META_META_ON \| KeyEvent.META_SHIFT_ON)) {
		groupNavigationDirection = View.FOCUS_BACKWARD;
		}
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -3563,6 +3563,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		dispatchDirectAudioEvent(event);
		return -1;
		}
		} else if (keyCode == KeyEvent.KEYCODE_TAB && event.isMetaPressed()) {
		// Pass through keyboard navigation keys.
		return 0;
		}

		// Toggle Caps Lock on META-ALT.