diff options
| author | Owen Lin <owenlin@google.com> | 2009-12-01 09:13:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-01 09:13:43 -0800 |
| commit | 4be7857e0df3d8d18e87c107b4d81e1e814ecf2c (patch) | |
| tree | 6218bdf588d785551689c21323ad763a3ad63cce /res | |
| parent | 4660f40661d073bcc800fd1aced8e1114306773f (diff) | |
| parent | 7511b6160862d21b8f511198f25b3fb9f3bd3b3a (diff) | |
| download | LegacyCamera-4be7857e0df3d8d18e87c107b4d81e1e814ecf2c.zip LegacyCamera-4be7857e0df3d8d18e87c107b4d81e1e814ecf2c.tar.gz LegacyCamera-4be7857e0df3d8d18e87c107b4d81e1e814ecf2c.tar.bz2 | |
am 7511b616: am ba4a1f66: Layout the menu item of second level on-screen menu.
Merge commit '7511b6160862d21b8f511198f25b3fb9f3bd3b3a'
* commit '7511b6160862d21b8f511198f25b3fb9f3bd3b3a':
Layout the menu item of second level on-screen menu.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/on_screen_submenu_item.xml | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/res/layout/on_screen_submenu_item.xml b/res/layout/on_screen_submenu_item.xml index 8e0470e..0cb6660 100644 --- a/res/layout/on_screen_submenu_item.xml +++ b/res/layout/on_screen_submenu_item.xml @@ -26,14 +26,27 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" /> - <TextView android:id="@+id/title" - android:layout_width="wrap_content" + <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:maxLines="2" - android:textAppearance="?android:attr/textAppearanceLarge" - android:ellipsize="end" - android:fadingEdge="horizontal" /> + android:gravity="center_vertical" + android:minHeight="?android:attr/listPreferredItemHeight"> + <TextView android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:maxLines="2" + android:textAppearance="?android:attr/textAppearanceLarge" + android:ellipsize="end" + android:fadingEdge="horizontal" /> + <TextView android:id="@+id/summary" + android:visibility='gone' + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@id/title" + android:layout_alignLeft="@id/title" + android:textAppearance="?android:attr/textAppearanceSmall" + android:singleLine="true" /> + </RelativeLayout> <RadioButton android:id="@+id/radio_button" android:focusable="false" android:clickable="false" |