Merge "Accessibility focus actinos incorectly set on accessibility node info." into jb-dev

sganov · Android (Google) Code Review · commit 911b0c0b15ae · 2012-05-07T18:29:09.000-07:00
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
@@ -4712,8 +4712,11 @@ void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
             }
         }
 
-        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);

Original file line number	Diff line number	Diff line change
`@@ -4712,8 +4712,11 @@ void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {`
`4712`	`4712`	`}`
`4713`	`4713`	`}`
`4714`	`4714`
`4715`		`- info.addAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);`
`4716`		`- info.addAction(AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);`
	`4715`	`+ if (!isAccessibilityFocused()) {`
	`4716`	`+ info.addAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);`
	`4717`	`+ } else {`
	`4718`	`+ info.addAction(AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);`
	`4719`	`+ }`
`4717`	`4720`
`4718`	`4721`	`if (isClickable()) {`
`4719`	`4722`	`info.addAction(AccessibilityNodeInfo.ACTION_CLICK);`