diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-02-14 15:45:15 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-14 15:45:15 -0800 |
| commit | 73eb97f628b298c7bd032aa9db11dadf05f5b539 (patch) | |
| tree | 50971568b34a113f4e0bcd8feb5c1bf727205df2 /core/java/android/view/ViewGroup.java | |
| parent | c6fd88e213703a581fe4680259981f09ae0444f2 (diff) | |
| download | frameworks_base-73eb97f628b298c7bd032aa9db11dadf05f5b539.zip frameworks_base-73eb97f628b298c7bd032aa9db11dadf05f5b539.tar.gz frameworks_base-73eb97f628b298c7bd032aa9db11dadf05f5b539.tar.bz2 | |
Revert "Incorrect behavior of View clear focus."
This reverts commit c6fd88e213703a581fe4680259981f09ae0444f2
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 5ac4b36..5c63366 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -675,14 +675,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager */ @Override public void clearFocus() { - if (DBG) { - System.out.println(this + " clearFocus()"); - } - if (mFocused == null) { - super.clearFocus(); - } else { + super.clearFocus(); + + // clear any child focus if it exists + if (mFocused != null) { mFocused.clearFocus(); - mFocused = null; } } @@ -694,12 +691,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager if (DBG) { System.out.println(this + " unFocus()"); } - if (mFocused == null) { - super.unFocus(); - } else { + + super.unFocus(); + if (mFocused != null) { mFocused.unFocus(); - mFocused = null; } + mFocused = null; } /** |