diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-02-06 23:58:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 23:58:52 +0000 |
| commit | eb642b60e7b1d2a62331303e699df874a50ad527 (patch) | |
| tree | 19162cddf474e7c6308c2ae7379d76171f55e470 /core/java/android/view/ViewGroup.java | |
| parent | 763ce6c0c48416a67a36919d1b7ac67d6b73c430 (diff) | |
| parent | ff9b2525db61d4c175d9d61a0847586001cd4a11 (diff) | |
| download | frameworks_base-eb642b60e7b1d2a62331303e699df874a50ad527.zip frameworks_base-eb642b60e7b1d2a62331303e699df874a50ad527.tar.gz frameworks_base-eb642b60e7b1d2a62331303e699df874a50ad527.tar.bz2 | |
am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
* commit 'ff9b2525db61d4c175d9d61a0847586001cd4a11':
Accessibility: ignore children of a view with node provider.
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
| -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 792b75b..7a36eb6 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(); |