diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-06-03 18:52:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-03 18:52:20 -0700 |
| commit | b6585d19311f13ec28fa38a3c849589dba8c293a (patch) | |
| tree | beca055ab3b1ef4271077732e1be588812582bcc /core | |
| parent | 757b3c274ef0df765bcbc351a64367ed39e69369 (diff) | |
| parent | b552d89e901225e2b6aa2602e874ab984c638415 (diff) | |
| download | frameworks_base-b6585d19311f13ec28fa38a3c849589dba8c293a.zip frameworks_base-b6585d19311f13ec28fa38a3c849589dba8c293a.tar.gz frameworks_base-b6585d19311f13ec28fa38a3c849589dba8c293a.tar.bz2 | |
Merge "Double input focus and focus movement in list not working." into jb-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 3 | ||||
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index a243c73..e7b0e78 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -765,8 +765,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager if (mFocused == null) { super.clearFocus(); } else { - mFocused.clearFocus(); + View focused = mFocused; mFocused = null; + focused.clearFocus(); } } diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index a84ece6..94aa0f6 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -1344,8 +1344,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te } } return; } - super.addFocusables(views, direction, focusableMode); } + super.addFocusables(views, direction, focusableMode); } @Override |