diff options
| author | Alan Viverette <alanv@google.com> | 2013-10-09 13:37:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 13:37:49 -0700 |
| commit | b44c4439ad237913de03908cd0751b285b18f787 (patch) | |
| tree | 088afba3dddcc8b39968a41cbf7acbd003687401 /core/java/android | |
| parent | 7d8589c1562519f2fe644647b83a525b321e44be (diff) | |
| parent | 606fadc84a96b7e0a1f0b95bc03c9430b32ad22f (diff) | |
am 606fadc8: am 6d1e4522: am d9f53c02: Merge "Clear accessibility focus when view becomes invisible" into klp-dev
* commit '606fadc84a96b7e0a1f0b95bc03c9430b32ad22f':
Clear accessibility focus when view becomes invisible
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 6a6ad765b6df..c774ebf171d0 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -9035,10 +9035,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ mPrivateFlags |= PFLAG_DRAWN; - if (((mViewFlags & VISIBILITY_MASK) == INVISIBLE) && hasFocus()) { + if (((mViewFlags & VISIBILITY_MASK) == INVISIBLE)) { // root view becoming invisible shouldn't clear focus and accessibility focus if (getRootView() != this) { - clearFocus(); + if (hasFocus()) clearFocus(); clearAccessibilityFocus(); } } |