Merge "Handle edge-case where no focusables exist" into oc-dev (f4c31bf6) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4675,7 +4675,8 @@ public final class ViewRootImpl implements ViewParent,
	if (focused == null && mView.restoreDefaultFocus()) {		if (focused == null && mView.restoreDefaultFocus()) {
	return true;		return true;
	}		}
	View cluster = focused.keyboardNavigationClusterSearch(null, direction);		View cluster = focused == null ? keyboardNavigationClusterSearch(null, direction)
			: focused.keyboardNavigationClusterSearch(null, direction);

	// Since requestFocus only takes "real" focus directions (and therefore also		// Since requestFocus only takes "real" focus directions (and therefore also
	// restoreFocusInCluster), convert forward/backward focus into FOCUS_DOWN.		// restoreFocusInCluster), convert forward/backward focus into FOCUS_DOWN.