summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-05-07 17:51:59 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2012-05-07 17:54:07 -0700
commit02afe2cfd35f684117a9eed3c31edea311ce7d95 (patch)
tree3776e05d8aaf22ce8a8963bf9dd94852c25f2d77 /core
parent2551e5a1d9990514d8116e352b8e5c2f10a9d303 (diff)
downloadframeworks_base-02afe2cfd35f684117a9eed3c31edea311ce7d95.zip
frameworks_base-02afe2cfd35f684117a9eed3c31edea311ce7d95.tar.gz
frameworks_base-02afe2cfd35f684117a9eed3c31edea311ce7d95.tar.bz2
Accessibility focus actinos incorectly set on accessibility node info.
bug:6456267 Change-Id: I9fce268623cebef49dd613d193a36a0a1a0654aa
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/View.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 5299d58..96f5e9e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4703,8 +4703,11 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
}
}
- info.addAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
- info.addAction(AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);
+ if (!isAccessibilityFocused()) {
+ info.addAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
+ } else {
+ info.addAction(AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);
+ }
if (isClickable()) {
info.addAction(AccessibilityNodeInfo.ACTION_CLICK);