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

Merge "Fix handling of constraints for unspecified height RelativeLayouts"

Browse Source
This commit is contained in:
Alan Viverette
2013-12-06 21:54:36 +00:00
committed by Android (Google) Code Review
parent 6018d01427 517a004603
commit 36be65f56b
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -741,19 +741,30 @@ public class RelativeLayout extends ViewGroup {
private int getChildMeasureSpec(int childStart, int childEnd,
int childSize, int startMargin, int endMargin, int startPadding,
int endPadding, int mySize) {
if (mySize < 0 && !mAllowBrokenMeasureSpecs) {
if (childSize >= 0) {
return MeasureSpec.makeMeasureSpec(childSize, MeasureSpec.EXACTLY);
}
// Negative values in a mySize/myWidth/myWidth value in RelativeLayout measurement
// is code for, "we got an unspecified mode in the RelativeLayout's measurespec."
// Carry it forward.
return MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
}
int childSpecMode = 0;
int childSpecSize = 0;
// Negative values in a mySize/myWidth/myWidth value in RelativeLayout
// 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) {
// Constraints fixed both edges, so child has an exact size.
childSpecSize = Math.max(0, childEnd - childStart);
childSpecMode = MeasureSpec.EXACTLY;
} else {
// Allow the child to be whatever size it wants.
childSpecSize = 0;
childSpecMode = MeasureSpec.UNSPECIFIED;
}
return MeasureSpec.makeMeasureSpec(childSpecSize, childSpecMode);
}
// Figure out start and end bounds.
int tempStart = childStart;
int tempEnd = childEnd;