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

Merge "Fix RelativeLayout measurement"

Browse Source
This commit is contained in:
Alan Viverette
2014-02-12 23:51:11 +00:00
committed by Android (Google) Code Review
parent 3024f10224 d5694f02d5
commit 5aa944d998
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/RelativeLayout.java
View File

@@ -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;