Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d60d3742 authored by Romain Guy's avatar Romain Guy
Browse files

Fix dialogs to occupy more space.

parent 744d9024
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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;
            }
+2 −2
Original line number Diff line number Diff line
@@ -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"