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

Commit 52e94c33 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of b90e2c85 to master"

parents 1429b73a 5e64084a

core/java/android/view/View.java

+2 −1
Original line number Diff line number Diff line
@@ -13286,7 +13286,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
                // about in case nothing has focus.  even if this specific view

                // isn't focusable, it may contain something that is, so let

                // the root view try to give this focus if nothing else does.

                if ((mParent != null) && (mViewFlags & ENABLED_MASK) == ENABLED) {

                if ((mParent != null) && ((mViewFlags & ENABLED_MASK) == ENABLED)

                        && (mBottom > mTop) && (mRight > mLeft)) {

                    mParent.focusableViewAvailable(this);

                }

            }