commit afa9e99c8849ede4a71610b0d2bcb86cb7cb6d66
author Svetoslav <svetoslavganov@google.com> Wed Jun 03 18:46:06 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 03 18:46:07 2015 +0000
tree 541b00b8494c389b011f45dfbce14ec656b7b848
parent 4a7bb4624f3b8a0633461e2f5d662fd80d816bbf
parent 6cc4627d88932c93ce4c8821a5714b5382cd0425

Merge "Fix finding views by accessibility id." into mnc-dev

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 1e92a06..68588b5 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -18290,7 +18290,11 @@
         if (accessibilityId < 0) {
             return null;
         }
-        return findViewByAccessibilityIdTraversal(accessibilityId);
+        View view = findViewByAccessibilityIdTraversal(accessibilityId);
+        if (view != null) {
+            return view.includeForAccessibility() ? view : null;
+        }
+        return null;
     }
 
     /**

core/java/android/view/ViewGroup.java

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index e015c04..dd32f85 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -1173,6 +1173,11 @@
         if (foundView != null) {
             return foundView;
         }
+
+        if (getAccessibilityNodeProvider() != null) {
+            return null;
+        }
+
         final int childrenCount = mChildrenCount;
         final View[] children = mChildren;
         for (int i = 0; i < childrenCount; i++) {
@@ -1182,6 +1187,7 @@
                 return foundView;
             }
         }
+
         return null;
     }