diff options
| author | Alan Viverette <alanv@google.com> | 2015-06-19 18:19:56 +0000 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-06-19 18:19:56 +0000 |
| commit | 9355533bf6f3bcd3fb72fc840253d08ca7dad379 (patch) | |
| tree | 306cc5794b6a35d3ea8b68afa32e62b25ead6c8d /core/java/android/widget/RelativeLayout.java | |
| parent | 3e2e064a1f989228f48e8faf588393a1a5ee1e31 (diff) | |
Revert "Work around inconsistent views in RelativeLayout.onMeasure()"
This reverts commit 3e2e064a1f989228f48e8faf588393a1a5ee1e31.
Change-Id: Ib3712076585cba507ef1666e3fb6abb2bedb016f
Diffstat (limited to 'core/java/android/widget/RelativeLayout.java')
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 339038eddf3f..affc5daa35f7 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -522,7 +522,7 @@ public class RelativeLayout extends ViewGroup { View baselineView = null; LayoutParams baselineParams = null; for (int i = 0; i < count; i++) { - final View child = views[i]; + final View child = getChildAt(i); if (child.getVisibility() != GONE) { final LayoutParams childParams = (LayoutParams) child.getLayoutParams(); if (baselineView == null || baselineParams == null @@ -548,9 +548,9 @@ public class RelativeLayout extends ViewGroup { if (offsetHorizontalAxis) { for (int i = 0; i < count; i++) { - final View child = views[i]; + View child = getChildAt(i); if (child.getVisibility() != GONE) { - final LayoutParams params = (LayoutParams) child.getLayoutParams(); + LayoutParams params = (LayoutParams) child.getLayoutParams(); final int[] rules = params.getRules(layoutDirection); if (rules[CENTER_IN_PARENT] != 0 || rules[CENTER_HORIZONTAL] != 0) { centerHorizontal(child, params, width); @@ -578,9 +578,9 @@ public class RelativeLayout extends ViewGroup { if (offsetVerticalAxis) { for (int i = 0; i < count; i++) { - final View child = views[i]; + View child = getChildAt(i); if (child.getVisibility() != GONE) { - final LayoutParams params = (LayoutParams) child.getLayoutParams(); + LayoutParams params = (LayoutParams) child.getLayoutParams(); final int[] rules = params.getRules(layoutDirection); if (rules[CENTER_IN_PARENT] != 0 || rules[CENTER_VERTICAL] != 0) { centerVertical(child, params, height); @@ -607,9 +607,9 @@ public class RelativeLayout extends ViewGroup { final int verticalOffset = contentBounds.top - top; if (horizontalOffset != 0 || verticalOffset != 0) { for (int i = 0; i < count; i++) { - final View child = views[i]; + View child = getChildAt(i); if (child.getVisibility() != GONE && child != ignore) { - final LayoutParams params = (LayoutParams) child.getLayoutParams(); + LayoutParams params = (LayoutParams) child.getLayoutParams(); if (horizontalGravity) { params.mLeft += horizontalOffset; params.mRight += horizontalOffset; @@ -626,9 +626,9 @@ public class RelativeLayout extends ViewGroup { if (isLayoutRtl()) { final int offsetWidth = myWidth - width; for (int i = 0; i < count; i++) { - final View child = views[i]; + View child = getChildAt(i); if (child.getVisibility() != GONE) { - final LayoutParams params = (LayoutParams) child.getLayoutParams(); + LayoutParams params = (LayoutParams) child.getLayoutParams(); params.mLeft -= offsetWidth; params.mRight -= offsetWidth; } |