diff options
| author | Ahbong Chang <cwahbong@google.com> | 2012-08-20 11:51:55 +0800 |
|---|---|---|
| committer | Ahbong Chang <cwahbong@google.com> | 2012-08-20 16:28:25 +0800 |
| commit | 6c589e23b30849f095c464e73c6bc5cfa68a8586 (patch) | |
| tree | 51406f6f1b07d062c91045cb6fbaf049ce60b19a /res/layout/dialog_picker.xml | |
| parent | 824d9c136513fb4b705b33fdb045925e1f67f290 (diff) | |
| download | android_packages_apps_Snap-6c589e23b30849f095c464e73c6bc5cfa68a8586.tar.gz android_packages_apps_Snap-6c589e23b30849f095c464e73c6bc5cfa68a8586.tar.bz2 android_packages_apps_Snap-6c589e23b30849f095c464e73c6bc5cfa68a8586.zip | |
Divider and cancel button now show in the dialog picker.
The root node of the included gl_root_group is "merge", whose attributes
can not be overriden by any "include" tag since it will be dropped.
All of the children inside gl_root_group have no weight. This makes
the first object occupy the whole space. We use a weighted frame layout
to wrap gl_root_group.
Bug: 7016213
Change-Id: I758806848f6af3eff2f7746c6ef949ce639c7f6e
Diffstat (limited to 'res/layout/dialog_picker.xml')
| -rw-r--r-- | res/layout/dialog_picker.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/res/layout/dialog_picker.xml b/res/layout/dialog_picker.xml index 4a625a10b..ff27c41f0 100644 --- a/res/layout/dialog_picker.xml +++ b/res/layout/dialog_picker.xml @@ -18,19 +18,19 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <include layout="@layout/gl_root_group" + <FrameLayout android:layout_weight="1" - android:layout_height="0dp" - android:layout_width="match_parent"/> - <View android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_weight="0" + android:layout_width="match_parent" + android:layout_height="0dp"> + <include layout="@layout/gl_root_group" /> + </FrameLayout> + <ImageView android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:background="?android:attr/dividerHorizontal" /> <Button style="?android:attr/buttonBarButtonStyle" android:id="@+id/cancel" - android:layout_weight="0" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@android:string/cancel" |