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

Commit cd7955f6 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Improve dialog padding when title or body text are missing" into lmp-dev

parents 0fd9d8a2 e809b11b

core/res/res/layout/alert_dialog_material.xml

+4 −4
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
            android:gravity="center_vertical|start"

            android:paddingStart="@dimen/alert_dialog_padding_material"

            android:paddingEnd="@dimen/alert_dialog_padding_material"

            android:paddingTop="@dimen/alert_dialog_padding_top_material"

            android:paddingBottom="12dip">

            android:paddingTop="@dimen/alert_dialog_padding_top_material">

            <ImageView android:id="@+id/icon"

                android:layout_width="32dip"

                android:layout_height="32dip"
@@ -57,7 +56,8 @@ 
        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical"

        android:minHeight="64dp">

        android:minHeight="64dp"

        android:paddingTop="@dimen/alert_dialog_padding_top_material">

        <ScrollView android:id="@+id/scrollView"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -75,7 +75,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:minHeight="48dp">

        android:minHeight="64dp">

        <FrameLayout android:id="@+id/custom"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

core/res/res/layout/alert_dialog_progress_material.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:paddingStart="@dimen/alert_dialog_padding_material"

    android:paddingEnd="@dimen/alert_dialog_padding_material">

    android:paddingTop="@dimen/alert_dialog_padding_top_material"

    android:paddingEnd="@dimen/alert_dialog_padding_material"

    android:paddingBottom="@dimen/alert_dialog_padding_top_material">

    <ProgressBar

        android:id="@+id/progress"

        style="?attr/progressBarStyleHorizontal"

core/res/res/layout/progress_dialog_material.xml

+4 −2
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
        android:layout_height="match_parent"

        android:baselineAligned="false"

        android:paddingStart="@dimen/alert_dialog_padding_material"

        android:paddingEnd="@dimen/alert_dialog_padding_material">

        android:paddingTop="@dimen/alert_dialog_padding_top_material"

        android:paddingEnd="@dimen/alert_dialog_padding_material"

        android:paddingBottom="@dimen/alert_dialog_padding_top_material">



        <ProgressBar

            android:id="@id/progress"
@@ -34,7 +36,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:max="10000"

            android:layout_marginEnd="16dp" />

            android:layout_marginEnd="@dimen/alert_dialog_padding_material" />



        <TextView

            android:id="@+id/message"