am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev

* commit '191807e3863d873cd315701ab7f32b0b51e1bf35':
  Remove baked-in shadow insets from Material dialog minHeight
This commit is contained in:
Alan Viverette
2014-10-01 15:02:45 +00:00
committed by Android Git Automerger

View File

@@ -56,7 +56,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:minHeight="64dp"> android:minHeight="48dp">
<ScrollView android:id="@+id/scrollView" <ScrollView android:id="@+id/scrollView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:minHeight="64dp"> android:minHeight="48dp">
<FrameLayout android:id="@+id/custom" <FrameLayout android:id="@+id/custom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />