diff options
| author | 2015-01-30 03:32:33 +0000 | |
|---|---|---|
| committer | 2015-01-30 03:32:33 +0000 | |
| commit | c89cdf2ad435b3b5da16405a0eceb600e93b7a3e (patch) | |
| tree | 4a3454531ca186e6296aef38b1f9865d6bc9a7bc | |
| parent | fd00f1e92606e656ea305eeead6f21fb991e9a57 (diff) | |
| parent | f607fa6b73019998588e613aa2ae8ee97958cee7 (diff) | |
am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
* commit 'f607fa6b73019998588e613aa2ae8ee97958cee7':
Avoid bug in LinearLayout measurement
| -rw-r--r-- | core/res/res/layout/dialog_custom_title_material.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/dialog_title_icons_material.xml | 3 | ||||
| -rw-r--r-- | core/res/res/layout/dialog_title_material.xml | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/core/res/res/layout/dialog_custom_title_material.xml b/core/res/res/layout/dialog_custom_title_material.xml index 248a05eac493..50ed9103eb7d 100644 --- a/core/res/res/layout/dialog_custom_title_material.xml +++ b/core/res/res/layout/dialog_custom_title_material.xml @@ -27,6 +27,8 @@ This is a custom layout for a dialog. android:layout_weight="0" android:gravity="center_vertical|start" style="?attr/windowTitleBackgroundStyle" /> + <View android:layout_width="match_parent" + android:layout_height="0dp" /> <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/core/res/res/layout/dialog_title_icons_material.xml b/core/res/res/layout/dialog_title_icons_material.xml index 62af0962fec7..3866ca767a16 100644 --- a/core/res/res/layout/dialog_title_icons_material.xml +++ b/core/res/res/layout/dialog_title_icons_material.xml @@ -48,6 +48,9 @@ enabled. android:layout_marginStart="8dip" /> </LinearLayout> + <View android:layout_width="match_parent" + android:layout_height="0dp" /> + <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" diff --git a/core/res/res/layout/dialog_title_material.xml b/core/res/res/layout/dialog_title_material.xml index 339d56993aa6..1ea7f6e03fbc 100644 --- a/core/res/res/layout/dialog_title_material.xml +++ b/core/res/res/layout/dialog_title_material.xml @@ -32,6 +32,8 @@ enabled. android:paddingStart="?attr/dialogPreferredPadding" android:paddingEnd="?attr/dialogPreferredPadding" android:paddingTop="@dimen/dialog_padding_top_material" /> + <View android:layout_width="match_parent" + android:layout_height="0dp" /> <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" |