diff options
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 1977ef5ae989..d3d46cb4f44b 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -143,7 +143,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // that is or contains a default-focus view. private View mDefaultFocus; // The last child of this ViewGroup which held focus within the current cluster - private View mFocusedInCluster; + View mFocusedInCluster; /** * A Transformation used when drawing children, to @@ -807,10 +807,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager return mDefaultFocus != null || super.hasDefaultFocus(); } - void setFocusedInCluster(View child) { - mFocusedInCluster = child; - } - /** * Removes {@code child} (and associated focusedInCluster chain) from the cluster containing * it. @@ -826,8 +822,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager ViewParent parent = this; do { ((ViewGroup) parent).mFocusedInCluster = null; + if (parent == top) { + break; + } parent = parent.getParent(); - } while (parent != top && parent instanceof ViewGroup); + } while (parent instanceof ViewGroup); } @Override |