diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/View.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 1292243d1b05..12ba30cf3308 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -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(); } /** diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index ab10ac17d01b..ee92744ea1d0 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -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; } |