summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-10-08 14:25:42 -0700
committerAlan Viverette <alanv@google.com>2013-10-08 14:25:42 -0700
commit2e84a9946750fbc0e411a4ea1f4ef5b565ce20bf (patch)
tree3c51ed3a710e8970e13232d0d78d0aa786132076
parentc37a5ab54e5e3ad3bb816d7c9e2b923af6f74f73 (diff)
downloadframeworks_base-2e84a9946750fbc0e411a4ea1f4ef5b565ce20bf.zip
frameworks_base-2e84a9946750fbc0e411a4ea1f4ef5b565ce20bf.tar.gz
frameworks_base-2e84a9946750fbc0e411a4ea1f4ef5b565ce20bf.tar.bz2
Clear accessibility focus when view becomes invisible
BUG: 10912882 Change-Id: I8c7c6906fcf7688ecdfac6649464f088dd812c41
-rw-r--r--core/java/android/view/View.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index caeb1d8..b9cf1b7 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8887,10 +8887,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();
}
}