Merge "Use Ctrl+Tab to navigate focus clusters" into udc-dev (a3542a9c) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -6969,10 +6969,10 @@ public final class ViewRootImpl implements ViewParent,

		if (event.getAction() == KeyEvent.ACTION_DOWN
		&& event.getKeyCode() == KeyEvent.KEYCODE_TAB) {
		if (KeyEvent.metaStateHasModifiers(event.getMetaState(), KeyEvent.META_META_ON)) {
		if (KeyEvent.metaStateHasModifiers(event.getMetaState(), KeyEvent.META_CTRL_ON)) {
		groupNavigationDirection = View.FOCUS_FORWARD;
		} else if (KeyEvent.metaStateHasModifiers(event.getMetaState(),
		KeyEvent.META_META_ON \| KeyEvent.META_SHIFT_ON)) {
		KeyEvent.META_CTRL_ON \| KeyEvent.META_SHIFT_ON)) {
		groupNavigationDirection = View.FOCUS_BACKWARD;
		}
		}