diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-06-03 18:55:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-03 18:55:22 -0700 |
| commit | b59d06186130921c02b6a4b0c98d0c43379df6d4 (patch) | |
| tree | c2f067afc0c3cfbd6bb1ae44b81aa55ff97d1d55 /core | |
| parent | dd0a64a9ba1c8536337d69d4de55d5c8b133c75d (diff) | |
| parent | b6585d19311f13ec28fa38a3c849589dba8c293a (diff) | |
| download | frameworks_base-b59d06186130921c02b6a4b0c98d0c43379df6d4.zip frameworks_base-b59d06186130921c02b6a4b0c98d0c43379df6d4.tar.gz frameworks_base-b59d06186130921c02b6a4b0c98d0c43379df6d4.tar.bz2 | |
am b6585d19: Merge "Double input focus and focus movement in list not working." into jb-dev
* commit 'b6585d19311f13ec28fa38a3c849589dba8c293a':
Double input focus and focus movement in list not working.
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 |