Merge "Exposes accessibility importance on AccessibilityNodeInfo"
diff --git a/api/current.txt b/api/current.txt
index 763efc8..72b1c0c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -43689,6 +43689,7 @@
method public boolean isEnabled();
method public boolean isFocusable();
method public boolean isFocused();
+ method public boolean isImportantForAccessibility();
method public boolean isLongClickable();
method public boolean isMultiLine();
method public boolean isPassword();
@@ -43727,6 +43728,7 @@
method public void setError(java.lang.CharSequence);
method public void setFocusable(boolean);
method public void setFocused(boolean);
+ method public void setImportantForAccessibility(boolean);
method public void setInputType(int);
method public void setLabelFor(android.view.View);
method public void setLabelFor(android.view.View, int);
diff --git a/api/system-current.txt b/api/system-current.txt
index 749ab0a..191bb04 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -46111,6 +46111,7 @@
method public boolean isEnabled();
method public boolean isFocusable();
method public boolean isFocused();
+ method public boolean isImportantForAccessibility();
method public boolean isLongClickable();
method public boolean isMultiLine();
method public boolean isPassword();
@@ -46149,6 +46150,7 @@
method public void setError(java.lang.CharSequence);
method public void setFocusable(boolean);
method public void setFocused(boolean);
+ method public void setImportantForAccessibility(boolean);
method public void setInputType(int);
method public void setLabelFor(android.view.View);
method public void setLabelFor(android.view.View, int);
diff --git a/api/test-current.txt b/api/test-current.txt
index 75f03b4..dffda3b 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -43706,6 +43706,7 @@
method public boolean isEnabled();
method public boolean isFocusable();
method public boolean isFocused();
+ method public boolean isImportantForAccessibility();
method public boolean isLongClickable();
method public boolean isMultiLine();
method public boolean isPassword();
@@ -43744,6 +43745,7 @@
method public void setError(java.lang.CharSequence);
method public void setFocusable(boolean);
method public void setFocused(boolean);
+ method public void setImportantForAccessibility(boolean);
method public void setInputType(int);
method public void setLabelFor(android.view.View);
method public void setLabelFor(android.view.View, int);
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index dd0887f..4a0a0b0 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -6770,6 +6770,13 @@
info.setVisibleToUser(isVisibleToUser());
+ if ((mAttachInfo != null) && ((mAttachInfo.mAccessibilityFetchFlags
+ & AccessibilityNodeInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS) != 0)) {
+ info.setImportantForAccessibility(isImportantForAccessibility());
+ } else {
+ info.setImportantForAccessibility(true);
+ }
+
info.setPackageName(mContext.getPackageName());
info.setClassName(getAccessibilityClassName());
info.setContentDescription(getContentDescription());
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
index 5248a67..bdaf291 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
@@ -569,6 +569,8 @@
private static final int BOOLEAN_PROPERTY_CONTEXT_CLICKABLE = 0x00020000;
+ private static final int BOOLEAN_PROPERTY_IMPORTANCE = 0x0040000;
+
/**
* Bits that provide the id of a virtual descendant of a view.
*/
@@ -2157,6 +2159,33 @@
}
/**
+ * Returns whether the node originates from a view considered important for accessibility.
+ *
+ * @return {@code true} if the node originates from a view considered important for
+ * accessibility, {@code false} otherwise
+ *
+ * @see View#isImportantForAccessibility()
+ */
+ public boolean isImportantForAccessibility() {
+ return getBooleanProperty(BOOLEAN_PROPERTY_IMPORTANCE);
+ }
+
+ /**
+ * Sets whether the node is considered important for accessibility.
+ * <p>
+ * <strong>Note:</strong> Cannot be called from an
+ * {@link android.accessibilityservice.AccessibilityService}.
+ * This class is made immutable before being delivered to an AccessibilityService.
+ * </p>
+ *
+ * @param important {@code true} if the node is considered important for accessibility,
+ * {@code false} otherwise
+ */
+ public void setImportantForAccessibility(boolean important) {
+ setBooleanProperty(BOOLEAN_PROPERTY_IMPORTANCE, important);
+ }
+
+ /**
* Gets the package this node comes from.
*
* @return The package name.