Merge "Finding focus for from rectangle now working." into jb-dev (5fd72a2c) · Commits · e / os / android_frameworks_base

core/java/android/view/FocusFinder.java

+29 −23

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ public class FocusFinder {
		* @return The next focusable view, or null if none exists.
		*/
		public final View findNextFocus(ViewGroup root, View focused, int direction) {
		return findNextFocus(root, focused, mFocusedRect, direction);
		return findNextFocus(root, focused, null, direction);
		}

		/**
		@@ -122,10 +122,15 @@ public class FocusFinder {
		int direction, ArrayList<View> focusables) {
		final int directionMasked = (direction & ~View.FOCUS_ACCESSIBILITY);
		if (focused != null) {
		if (focusedRect == null) {
		focusedRect = mFocusedRect;
		}
		// fill in interesting rect from focused
		focused.getFocusedRect(focusedRect);
		root.offsetDescendantRectToMyCoords(focused, focusedRect);
		} else {
		if (focusedRect == null) {
		focusedRect = mFocusedRect;
		// make up a rect at top left or bottom right of root
		switch (directionMasked) {
		case View.FOCUS_RIGHT:
		@@ -153,6 +158,7 @@ public class FocusFinder {
		}
		}
		}
		}

		switch (directionMasked) {
		case View.FOCUS_FORWARD: