diff options
| author | 2014-10-01 00:32:38 +0000 | |
|---|---|---|
| committer | 2014-10-01 00:32:39 +0000 | |
| commit | 191807e3863d873cd315701ab7f32b0b51e1bf35 (patch) | |
| tree | 628550f91494bbdac5cd35a1c91865f36a946f68 | |
| parent | ab1e241d385ac2cb589f961cf6ea4a86b8a3e867 (diff) | |
| parent | b21e5662d5a5ed09350d116950fe2c4bd5850b40 (diff) | |
Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev
| -rw-r--r-- | core/res/res/layout/alert_dialog_material.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/layout/alert_dialog_material.xml b/core/res/res/layout/alert_dialog_material.xml index 545d95eebb82..c96182853a16 100644 --- a/core/res/res/layout/alert_dialog_material.xml +++ b/core/res/res/layout/alert_dialog_material.xml @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:minHeight="64dp"> + android:minHeight="48dp"> <ScrollView android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -84,7 +84,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:minHeight="64dp"> + android:minHeight="48dp"> <FrameLayout android:id="@+id/custom" android:layout_width="match_parent" android:layout_height="wrap_content" /> |