Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ac4c58d authored Jun 26, 2015 by Adam Powell Committed by Android Git Automerger Jun 26, 2015

am 6356d3b2: Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev

* commit '6356d3b2':
  Improve docs for View#addChildrenForAccessibility

parents 7695d37b 6356d3b2

core/java/android/view/View.java

+6 −6

Original line number	Original line	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		* Adds the children of this View relevant for accessibility to the given list
	* not important for accessibility the children for accessibility are not		* as output. Since some Views are not important for accessibility the added
	* necessarily direct children of the view, rather they are the first level of		* child views are not necessarily direct children of this view, rather they are
	* descendants important for accessibility.		* 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) {

	}		}

core/java/android/view/ViewGroup.java

+3 −3

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

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