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

Commit 5a12c0c8 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am fa9fc5bc: Merge "Add a minimum height of 64dp for AlertDialog content" into jb-mr1-dev 

* commit 'fa9fc5bc':
  Add a minimum height of 64dp for AlertDialog content
parents 831f31c3 fa9fc5bc

core/res/res/layout/alert_dialog_holo.xml

+4 −2
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical">

        android:orientation="vertical"

        android:minHeight="64dp">

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -86,7 +87,8 @@ 
    <FrameLayout android:id="@+id/customPanel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1">

        android:layout_weight="1"

        android:minHeight="64dp">

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />