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

Commit 87d2169b authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 

automerge: c89cdf2a

* commit 'c89cdf2a':
  Avoid bug in LinearLayout measurement
parents 50e54d01 c89cdf2a

core/res/res/layout/dialog_custom_title_material.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ This is a custom layout for a dialog. 
        android:layout_weight="0"

        android:layout_weight="0"

        android:gravity="center_vertical|start"

        android:gravity="center_vertical|start"

        style="?attr/windowTitleBackgroundStyle" />

        style="?attr/windowTitleBackgroundStyle" />

    <View android:layout_width="match_parent"

        android:layout_height="0dp" />

    <FrameLayout

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

core/res/res/layout/dialog_title_icons_material.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,9 @@ enabled. 
            android:layout_marginStart="8dip" />

            android:layout_marginStart="8dip" />

    </LinearLayout>

    </LinearLayout>





    <View android:layout_width="match_parent"

        android:layout_height="0dp" />



    <FrameLayout

    <FrameLayout

        android:layout_width="match_parent" android:layout_height="wrap_content"

        android:layout_width="match_parent" android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_weight="1"

core/res/res/layout/dialog_title_material.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,8 @@ enabled. 
        android:paddingStart="?attr/dialogPreferredPadding"

        android:paddingStart="?attr/dialogPreferredPadding"

        android:paddingEnd="?attr/dialogPreferredPadding"

        android:paddingEnd="?attr/dialogPreferredPadding"

        android:paddingTop="@dimen/dialog_padding_top_material" />

        android:paddingTop="@dimen/dialog_padding_top_material" />

    <View android:layout_width="match_parent"

        android:layout_height="0dp" />

    <FrameLayout

    <FrameLayout

        android:layout_width="match_parent" android:layout_height="wrap_content"

        android:layout_width="match_parent" android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_weight="1"