Furtherly improve list menu handling.

Improve layout of top-level menu items, and avoid second level menu
items being obscured by the navigation bar.

Change-Id: Ic3ee983e33613f7337839d11cae9520b86636b7d

1 files changed, 27 insertions, 23 deletions

diff --git a/res/layout/list_menu_item.xml b/res/layout/list_menu_item.xml
index 025bb607d..36e41d2a5 100644
--- a/res/layout/list_menu_item.xml
+++ b/res/layout/list_menu_item.xml
@@ -28,37 +28,41 @@
 -->
 <com.android.camera.ui.ListMenuItem xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/setting_row_height"
     android:background="@drawable/setting_list_item_bg"
-    android:padding="5dip" >
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingLeft="8dip"
+    android:paddingRight="8dip" >
 
     <ImageView
         android:id="@+id/list_image"
         android:layout_width="@dimen/setting_item_icon_width"
         android:layout_height="@dimen/setting_item_icon_width"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="20dp"
-        android:gravity="center" />
+        android:layout_marginRight="16dp" />
 
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/list_image"
-        android:textColor="@android:color/white"
-        android:textStyle="bold" />
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/current_setting"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/title"
-        android:layout_marginTop="1dip"
-        android:layout_toRightOf="@+id/list_image"
-        android:text="@string/crop_save"
-        android:textColor="@color/white"
-        android:textSize="10dip"
-        android:textStyle="bold" />
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/current_setting"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="1dip"
+            android:text="@string/crop_save"
+            android:textColor="@color/white"
+            android:textSize="10dip"
+            android:textStyle="bold" />
+
+    </LinearLayout>
 
 </com.android.camera.ui.ListMenuItem>