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

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

Merge "Fix a bug in View#hasFocusable with new auto-focusable behavior"

parents 655ce66b 24e78d72

core/java/android/view/View.java

+3 −1
Original line number Diff line number Diff line
@@ -6409,7 +6409,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        if ((mViewFlags & VISIBILITY_MASK) != VISIBLE) {

            return false;

        }

        return allowAutoFocus ? getFocusable() != NOT_FOCUSABLE : getFocusable() == FOCUSABLE;

        return (allowAutoFocus

                ? getFocusable() != NOT_FOCUSABLE

                : getFocusable() == FOCUSABLE) && isFocusable();

    }















    /**

































core/java/android/view/ViewGroup.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -1114,7 +1114,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager













        }































        // TODO This should probably be super.hasFocusable, but that would change behavior













        if (allowAutoFocus ? getFocusable() != NOT_FOCUSABLE : getFocusable() == FOCUSABLE) {













        if ((allowAutoFocus ? getFocusable() != NOT_FOCUSABLE : getFocusable() == FOCUSABLE)













                && isFocusable()) {















            return true;















        }