diff options
| author | John Reck <jreck@google.com> | 2012-04-17 15:37:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-17 15:37:48 -0700 |
| commit | 06fd472390126c74977ce9a0b2f912e91ebf2744 (patch) | |
| tree | d703d7181481cd12b6044e9397b300acc443d425 /core/java/android | |
| parent | c5cbcb51baaf2e9e61f3bdbd5ef97a05aac25010 (diff) | |
| parent | 09dd116cd39613a3736dbbf028544e1655002430 (diff) | |
| download | frameworks_base-06fd472390126c74977ce9a0b2f912e91ebf2744.zip frameworks_base-06fd472390126c74977ce9a0b2f912e91ebf2744.tar.gz frameworks_base-06fd472390126c74977ce9a0b2f912e91ebf2744.tar.bz2 | |
Merge "Fix a bug with enterTouchMode removing focus"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index b4554d5..1472993 100644 --- 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) { |