diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index bebe67f..90e80d3 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -748,14 +748,14 @@ public class RelativeLayout extends ViewGroup { // measurement is code for, "we got an unspecified mode in the // RelativeLayout's measure spec." if (mySize < 0 && !mAllowBrokenMeasureSpecs) { - if (childSize >= 0) { - // The child specified an exact size. - childSpecSize = childSize; - childSpecMode = MeasureSpec.EXACTLY; - } else if (childStart >= 0 && childEnd >= 0) { + if (childStart >= 0 && childEnd >= 0) { // Constraints fixed both edges, so child has an exact size. childSpecSize = Math.max(0, childEnd - childStart); childSpecMode = MeasureSpec.EXACTLY; + } else if (childSize >= 0) { + // The child specified an exact size. + childSpecSize = childSize; + childSpecMode = MeasureSpec.EXACTLY; } else { // Allow the child to be whatever size it wants. childSpecSize = 0; |