summaryrefslogtreecommitdiff
path: root/core/java/android/view/ViewGroup.java
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-06-03 18:59:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-03 18:59:50 -0700
commitbc595b798ea55fefddedb253afb6ac8c7849eff6 (patch)
treec338322bb7172eb8c7ad853544cca1b120047eec /core/java/android/view/ViewGroup.java
parent0289de81208f0c713c8963a98a8ac7c81288f714 (diff)
parentb59d06186130921c02b6a4b0c98d0c43379df6d4 (diff)
am b59d0618: am b6585d19: Merge "Double input focus and focus movement in list not working." into jb-dev
* commit 'b59d06186130921c02b6a4b0c98d0c43379df6d4': Double input focus and focus movement in list not working.
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
-rw-r--r--core/java/android/view/ViewGroup.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index e97ebe4affd5..a6ba0ec57f16 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();
}
}