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

Merge change 5428 into donut

Browse Source 
* changes:
  Improve handling of FILL_PARENT in RelativeLayout.
This commit is contained in:
Android (Google) Code Review
2009-06-25 15:28:10 -07:00
parent c44989d6c7 f782e60efc
commit 6067d953d7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,7 +358,7 @@ public class RelativeLayout extends ViewGroup {
LayoutParams params = (LayoutParams) child.getLayoutParams(); LayoutParams params = (LayoutParams) child.getLayoutParams();
applyHorizontalSizeRules(params, myWidth); applyHorizontalSizeRules(params, myWidth);
measureChildHorizontal(child, params, myWidth); measureChildHorizontal(child, params, myWidth, myHeight);
if (positionChildHorizontal(child, params, myWidth, isWrapContentWidth)) { if (positionChildHorizontal(child, params, myWidth, isWrapContentWidth)) {
offsetHorizontalAxis = true; offsetHorizontalAxis = true;
} }
@@ -550,13 +550,18 @@ public class RelativeLayout extends ViewGroup {
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
} }
private void measureChildHorizontal(View child, LayoutParams params, int myWidth) { private void measureChildHorizontal(View child, LayoutParams params, int myWidth, int myHeight) {
int childWidthMeasureSpec = getChildMeasureSpec(params.mLeft, int childWidthMeasureSpec = getChildMeasureSpec(params.mLeft,
params.mRight, params.width, params.mRight, params.width,
params.leftMargin, params.rightMargin, params.leftMargin, params.rightMargin,
mPaddingLeft, mPaddingRight, mPaddingLeft, mPaddingRight,
myWidth); myWidth);
int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); int childHeightMeasureSpec;
if (params.width == LayoutParams.FILL_PARENT) {
childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.EXACTLY, myHeight);
} else {
childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
}
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
} }