Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd38cc749215c0e41bcb06703066c379de83d91e4':
  Avoid bug in LinearLayout measurement
This commit is contained in:
Alan Viverette
2015-01-30 03:20:44 +00:00
committed by Android Git Automerger
parent 5d0cf917c3 d38cc74921
commit f607fa6b73
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/layout/dialog_custom_title_material.xml
View File

@@ -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"

3
core/res/res/layout/dialog_title_icons_material.xml
View File

@@ -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"

2
core/res/res/layout/dialog_title_material.xml
View File

@@ -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"