Merge "Stop focusing views before layout." into oc-dr1-dev

2017-08-10 22:34:03 +00:00
parent 0716c8e60e edbcf2c4bf
commit a5dab05b61
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -13281,7 +13281,7 @@ 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)) {
+                if ((mParent != null) && (mBottom > mTop) && (mRight > mLeft)) {
                    mParent.focusableViewAvailable(this);
                }
            }