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

Commit 5e64084a authored by Phil Weaver's avatar Phil Weaver
Browse files

resolve merge conflicts of b90e2c85 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iea5014345e8a1efd9a30cd8bb18684bdc310ac85
parents 67641097 b90e2c85

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);

                }

            }