diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-02-07 00:11:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-07 00:11:05 +0000 |
| commit | f89c6f3c8068bc90557a6ade5b0541da4b2ff622 (patch) | |
| tree | 014e4d79fd77f1d459bf1d1db75725f1e7c5aa59 /core/java/android | |
| parent | 033c2a21f857948416eeaa36e6a613743b548eff (diff) | |
| parent | eb642b60e7b1d2a62331303e699df874a50ad527 (diff) | |
am eb642b60: am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
* commit 'eb642b60e7b1d2a62331303e699df874a50ad527':
Accessibility: ignore children of a view with node provider.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index c4b5bbcf2f38..d549fbfeecb5 100644 --- 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(); |