commit 02afe2cfd35f684117a9eed3c31edea311ce7d95
author Svetoslav Ganov <svetoslavganov@google.com> Mon May 07 17:51:59 2012 -0700
committer Svetoslav Ganov <svetoslavganov@google.com> Mon May 07 17:54:07 2012 -0700
tree 3776e05d8aaf22ce8a8963bf9dd94852c25f2d77
parent 2551e5a1d9990514d8116e352b8e5c2f10a9d303

Accessibility focus actinos incorectly set on accessibility node info.

bug:6456267

Change-Id: I9fce268623cebef49dd613d193a36a0a1a0654aa

core/java/android/view/View.java

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 @@
             }
         }
 
-        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);