drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Finding focus for from rectangle now working." into jb-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-05-04 15:49:44 -07:00
committed by Android (Google) Code Review
parent 8c58677e28 951bb42166
commit 5fd72a2cce
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/java/android/view/FocusFinder.java
View File

@ -62,7 +62,7 @@ public class FocusFinder {
* @return The next focusable view, or null if none exists. * @return The next focusable view, or null if none exists.
*/ */
public final View findNextFocus(ViewGroup root, View focused, int direction) { public final View findNextFocus(ViewGroup root, View focused, int direction) {
return findNextFocus(root, focused, mFocusedRect, direction); return findNextFocus(root, focused, null, direction);
} }
/** /**
@ -122,34 +122,40 @@ public class FocusFinder {
int direction, ArrayList<View> focusables) { int direction, ArrayList<View> focusables) {
final int directionMasked = (direction & ~View.FOCUS_ACCESSIBILITY); final int directionMasked = (direction & ~View.FOCUS_ACCESSIBILITY);
if (focused != null) { if (focused != null) {
if (focusedRect == null) {
focusedRect = mFocusedRect;
}
// fill in interesting rect from focused // fill in interesting rect from focused
focused.getFocusedRect(focusedRect); focused.getFocusedRect(focusedRect);
root.offsetDescendantRectToMyCoords(focused, focusedRect); root.offsetDescendantRectToMyCoords(focused, focusedRect);
} else { } else {
// make up a rect at top left or bottom right of root if (focusedRect == null) {
switch (directionMasked) { focusedRect = mFocusedRect;
case View.FOCUS_RIGHT: // make up a rect at top left or bottom right of root
case View.FOCUS_DOWN: switch (directionMasked) {
setFocusTopLeft(root, focusedRect); case View.FOCUS_RIGHT:
break; case View.FOCUS_DOWN:
case View.FOCUS_FORWARD:
if (root.isLayoutRtl()) {
setFocusBottomRight(root, focusedRect);
} else {
setFocusTopLeft(root, focusedRect); setFocusTopLeft(root, focusedRect);
} break;
break; case View.FOCUS_FORWARD:
if (root.isLayoutRtl()) {
setFocusBottomRight(root, focusedRect);
} else {
setFocusTopLeft(root, focusedRect);
}
break;
case View.FOCUS_LEFT: case View.FOCUS_LEFT:
case View.FOCUS_UP: case View.FOCUS_UP:
setFocusBottomRight(root, focusedRect);
break;
case View.FOCUS_BACKWARD:
if (root.isLayoutRtl()) {
setFocusTopLeft(root, focusedRect);
} else {
setFocusBottomRight(root, focusedRect); setFocusBottomRight(root, focusedRect);
break; break;
case View.FOCUS_BACKWARD:
if (root.isLayoutRtl()) {
setFocusTopLeft(root, focusedRect);
} else {
setFocusBottomRight(root, focusedRect);
break;
}
} }
} }
} }