Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ViewPager crash for a11y z order." into nyc-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-02-11 20:58:30 +00:00
committed by Android (Google) Code Review
parent a97006f9c6 4354b340bb
commit fd32b894ff
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/View.java
View File

@@ -6874,6 +6874,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @param info The info whose drawing order should be populated * @param info The info whose drawing order should be populated
*/ */
private void populateAccessibilityNodeInfoDrawingOrderInParent(AccessibilityNodeInfo info) { private void populateAccessibilityNodeInfoDrawingOrderInParent(AccessibilityNodeInfo info) {
/*
* If the view's bounds haven't been set yet, layout has not completed. In that situation,
* drawing order may not be well-defined, and some Views with custom drawing order may
* not be initialized sufficiently to respond properly getChildDrawingOrder.
*/
if ((mPrivateFlags & PFLAG_HAS_BOUNDS) == 0) {
info.setDrawingOrder(0);
return;
}
int drawingOrderInParent = 1; int drawingOrderInParent = 1;
// Iterate up the hierarchy if parents are not important for a11y // Iterate up the hierarchy if parents are not important for a11y
View viewAtDrawingLevel = this; View viewAtDrawingLevel = this;