Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev

2015-02-06 21:48:05 +00:00
parent 060bca7444 55bdb10c16
commit 34123f1ce8
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -2687,6 +2687,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
    @Override
    void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
        super.onInitializeAccessibilityNodeInfoInternal(info);
+        if (getAccessibilityNodeProvider() != null) {
+            return;
+        }
        if (mAttachInfo != null) {
            final ArrayList<View> childrenForAccessibility = mAttachInfo.mTempArrayList;
            childrenForAccessibility.clear();