Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06fd4723 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug with enterTouchMode removing focus"

parents c5cbcb51 09dd116c

core/java/android/view/ViewRootImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -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) {