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

Merge "Fix alert dialog layout size in landscape"

Browse Source
This commit is contained in:
Adam Powell
2010-10-08 17:10:24 -07:00
committed by Android (Google) Code Review
parent 7ff6f97f84 4fb17b0490
commit 54ca811b29
4 changed files with 176 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/com/android/internal/widget/WeightedLinearLayout.java
View File

@@ -30,8 +30,10 @@ import static com.android.internal.R.*;
* the available space.
*/
public class WeightedLinearLayout extends LinearLayout {
private float mMajorWeight;
private float mMinorWeight;
private float mMajorWeightMin;
private float mMinorWeightMin;
private float mMajorWeightMax;
private float mMinorWeightMax;
public WeightedLinearLayout(Context context) {
super(context);
@@ -43,8 +45,10 @@ public class WeightedLinearLayout extends LinearLayout {
TypedArray a =
context.obtainStyledAttributes(attrs, styleable.WeightedLinearLayout);
mMajorWeight = a.getFloat(styleable.WeightedLinearLayout_majorWeight, 0.0f);
mMinorWeight = a.getFloat(styleable.WeightedLinearLayout_minorWeight, 0.0f);
mMajorWeightMin = a.getFloat(styleable.WeightedLinearLayout_majorWeightMin, 0.0f);
mMinorWeightMin = a.getFloat(styleable.WeightedLinearLayout_minorWeightMin, 0.0f);
mMajorWeightMax = a.getFloat(styleable.WeightedLinearLayout_majorWeightMax, 0.0f);
mMinorWeightMax = a.getFloat(styleable.WeightedLinearLayout_minorWeightMax, 0.0f);
a.recycle();
}
@@ -60,17 +64,20 @@ public class WeightedLinearLayout extends LinearLayout {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int width = getMeasuredWidth();
int height = getMeasuredHeight();
boolean measure = false;
widthMeasureSpec = MeasureSpec.makeMeasureSpec(width, EXACTLY);
heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, EXACTLY);
final float widthWeight = isPortrait ? mMinorWeight : mMajorWeight;
if (widthMode == AT_MOST && widthWeight > 0.0f) {
if (width < (screenWidth * widthWeight)) {
widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (screenWidth * widthWeight),
EXACTLY);
final float widthWeightMin = isPortrait ? mMinorWeightMin : mMajorWeightMin;
final float widthWeightMax = isPortrait ? mMinorWeightMax : mMajorWeightMax;
if (widthMode == AT_MOST) {
final int weightedMin = (int) (screenWidth * widthWeightMin);
final int weightedMax = (int) (screenWidth * widthWeightMin);
if (widthWeightMin > 0.0f && width < weightedMin) {
widthMeasureSpec = MeasureSpec.makeMeasureSpec(weightedMin, EXACTLY);
measure = true;
} else if (widthWeightMax > 0.0f && width > weightedMax) {
widthMeasureSpec = MeasureSpec.makeMeasureSpec(weightedMax, EXACTLY);
measure = true;
}
}
@@ -78,7 +85,7 @@ public class WeightedLinearLayout extends LinearLayout {
// TODO: Support height?
if (measure) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
}
}