Merge "Fix a bug with enterTouchMode removing focus"

2012-04-17 15:37:48 -07:00
parent c5cbcb51ba 09dd116cd3
commit 06fd472390
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2977,7 +2977,10 @@ public final class ViewRootImpl implements ViewParent,
                // be when the window is first being added, and mFocused isn't
                // set yet.
                final View focused = mView.findFocus();
-                if (focused != null && !focused.isFocusableInTouchMode()) {
+                if (focused != null) {
+                    if (focused.isFocusableInTouchMode()) {
+                        return true;
+                    }
                    final ViewGroup ancestorToTakeFocus =
                            findAncestorToTakeFocusInTouchMode(focused);
                    if (ancestorToTakeFocus != null) {