summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/ButtonGroup.java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/widget/ButtonGroup.java')
-rw-r--r--core/java/android/widget/ButtonGroup.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/widget/ButtonGroup.java b/core/java/android/widget/ButtonGroup.java
index 6af1c7e..7548ef6 100644
--- a/core/java/android/widget/ButtonGroup.java
+++ b/core/java/android/widget/ButtonGroup.java
@@ -167,12 +167,14 @@ public class ButtonGroup extends LinearLayout {
if (getOrientation() == VERTICAL) {
final int dividerSize = mDividerHeight * dividerCount;
- setMeasuredDimension(getMeasuredWidth(),
- resolveSize(getMeasuredHeight() + dividerSize, heightMeasureSpec));
+ setMeasuredDimension(getMeasuredWidthAndState(),
+ resolveSizeAndState(getMeasuredHeight() + dividerSize, heightMeasureSpec,
+ getMeasuredHeightAndState()));
} else {
final int dividerSize = mDividerWidth * dividerCount;
- setMeasuredDimension(resolveSize(getMeasuredWidth() + dividerSize, widthMeasureSpec),
- getMeasuredHeight());
+ setMeasuredDimension(resolveSizeAndState(getMeasuredWidth() + dividerSize,
+ widthMeasureSpec, getMeasuredWidthAndState()),
+ getMeasuredHeightAndState());
}
}