diff options
| author | Alan Viverette <alanv@google.com> | 2013-10-09 20:25:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-09 20:25:15 +0000 |
| commit | d9f53c02766d9a9c00f303d8047cacef4e9673cf (patch) | |
| tree | 8a0165708151cf7a1f1ba8716c2d44d4f989cf67 /core/java | |
| parent | d7c44ee6b676d1c80fa6ad3763d718f8f2ff1554 (diff) | |
| parent | 2e84a9946750fbc0e411a4ea1f4ef5b565ce20bf (diff) | |
| download | frameworks_base-d9f53c02766d9a9c00f303d8047cacef4e9673cf.zip frameworks_base-d9f53c02766d9a9c00f303d8047cacef4e9673cf.tar.gz frameworks_base-d9f53c02766d9a9c00f303d8047cacef4e9673cf.tar.bz2 | |
Merge "Clear accessibility focus when view becomes invisible" into klp-dev
Diffstat (limited to 'core/java')
| -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 40db8b9..01da6b3 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -8895,10 +8895,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(); } } |