Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev (6356d3b2) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -8701,14 +8701,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		/**
		* Adds the children of a given View for accessibility. Since some Views are
		* not important for accessibility the children for accessibility are not
		* necessarily direct children of the view, rather they are the first level of
		* descendants important for accessibility.
		* Adds the children of this View relevant for accessibility to the given list
		* as output. Since some Views are not important for accessibility the added
		* child views are not necessarily direct children of this view, rather they are
		* the first level of descendants important for accessibility.
		*
		* @param children The list of children for accessibility.
		* @param outChildren The output list that will receive children for accessibility.
		*/
		public void addChildrenForAccessibility(ArrayList<View> children) {
		public void addChildrenForAccessibility(ArrayList<View> outChildren) {

		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -1919,7 +1919,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}

		@Override
		public void addChildrenForAccessibility(ArrayList<View> childrenForAccessibility) {
		public void addChildrenForAccessibility(ArrayList<View> outChildren) {
		if (getAccessibilityNodeProvider() != null) {
		return;
		}
		@@ -1930,9 +1930,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		View child = children.getChildAt(i);
		if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE) {
		if (child.includeForAccessibility()) {
		childrenForAccessibility.add(child);
		outChildren.add(child);
		} else {
		child.addChildrenForAccessibility(childrenForAccessibility);
		child.addChildrenForAccessibility(outChildren);
		}
		}
		}