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

Fix dialogs to occupy more space.

Browse Source
This commit is contained in:
Romain Guy
2010-02-05 12:58:47 -08:00
parent 744d902453
commit d60d3742ab
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,8 @@ public class WeightedLinearLayout extends LinearLayout {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
final boolean isPortrait = metrics.widthPixels < metrics.heightPixels;
final int screenWidth = metrics.widthPixels;
final boolean isPortrait = screenWidth < metrics.heightPixels;
final int widthMode = getMode(widthMeasureSpec);
@@ -62,14 +63,13 @@ public class WeightedLinearLayout extends LinearLayout {
int height = getMeasuredHeight();
boolean measure = false;
final int widthSize = getSize(widthMeasureSpec);
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 < (widthSize * widthWeight)) {
widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (widthSize * widthWeight),
if (width < (screenWidth * widthWeight)) {
widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (screenWidth * widthWeight),
EXACTLY);
measure = true;
}

4
core/res/res/layout/alert_dialog.xml
View File

@@ -28,8 +28,8 @@
android:paddingBottom="3dip"
android:paddingLeft="3dip"
android:paddingRight="1dip"
android:majorWeight="0.5"
android:minorWeight="0.8">
android:majorWeight="0.65"
android:minorWeight="0.9">
<LinearLayout android:id="@+id/topPanel"
android:layout_width="match_parent"