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

am: a5dab05b61

Change-Id: I31f4ce541ac56887549a654b5e313e1f361152c3

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index eea692aa952a..2b4015f9063e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -13284,7 +13284,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);
                 }
             }