De-uglify menu.

Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761

9 files changed, 8 insertions, 34 deletions

diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 2075a94f4..cb49367d0 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -50,9 +50,6 @@
                 android:text="@string/rendering_photo_sphere"
                 android:textColor="@color/white"
                 android:textSize="14sp"
-                android:shadowDx="0"
-                android:shadowDy="0"
-                android:shadowRadius="2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="visible"
diff --git a/res/layout/filter_mode_view.xml b/res/layout/filter_mode_view.xml
index 558d7ce77..d4128f533 100644
--- a/res/layout/filter_mode_view.xml
+++ b/res/layout/filter_mode_view.xml
@@ -35,24 +35,21 @@
     <LinearLayout
         android:layout_width="@dimen/filter_mode_width"
         android:layout_height="@dimen/filter_mode_height"
-        android:orientation="vertical">
+        android:background="@drawable/scene_filter_item_bg"
+        android:orientation="vertical"
+        android:padding="2dp">
 
         <ImageView
             android:id="@+id/image"
             android:layout_width="80dp"
             android:layout_height="80dp"
-            android:layout_gravity="center"
-            android:padding="2dp" />
+            android:layout_gravity="center" />
 
         <TextView
             android:id="@+id/label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:shadowColor="@android:color/black"
-            android:shadowDx="1"
-            android:shadowDy="1"
-            android:shadowRadius="2"
             android:singleLine="true"
             android:textColor="@android:color/white"
             android:textSize="13sp"
diff --git a/res/layout/horiz_grid.xml b/res/layout/horiz_grid.xml
index 910b0ea66..63dc5cf3c 100644
--- a/res/layout/horiz_grid.xml
+++ b/res/layout/horiz_grid.xml
@@ -29,7 +29,6 @@
 <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:alpha="0.85"
     android:background="@color/popup_background"
     android:scrollbars="none" >
 
diff --git a/res/layout/list_menu.xml b/res/layout/list_menu.xml
index e110fd571..dd4354456 100644
--- a/res/layout/list_menu.xml
+++ b/res/layout/list_menu.xml
@@ -29,7 +29,6 @@
 <com.android.camera.ui.ListMenu xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/big_setting_popup_window_width"
     android:layout_height="wrap_content"
-    android:alpha="0.85"
     android:background="@color/popup_background"
     android:scrollbars="none" >
 
diff --git a/res/layout/list_menu_item.xml b/res/layout/list_menu_item.xml
index 53ef47682..070ffe5d9 100644
--- a/res/layout/list_menu_item.xml
+++ b/res/layout/list_menu_item.xml
@@ -29,7 +29,7 @@
 <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:orientation="horizontal"
+    android:background="@drawable/setting_list_item_bg"
     android:padding="5dip" >
 
     <ImageView
@@ -37,6 +37,7 @@
         android:layout_width="@dimen/setting_item_icon_width"
         android:layout_height="@dimen/setting_item_icon_width"
         android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
         android:layout_marginEnd="15dp"
         android:gravity="center" />
 
@@ -44,7 +45,6 @@
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/list_image"
         android:layout_toEndOf="@+id/list_image"
         android:textColor="@android:color/white"
         android:textStyle="bold" />
@@ -56,10 +56,6 @@
         android:layout_below="@id/title"
         android:layout_marginTop="1dip"
         android:layout_toEndOf="@+id/list_image"
-        android:shadowColor="@android:color/black"
-        android:shadowDx="1"
-        android:shadowDy="1"
-        android:shadowRadius="2"
         android:text="@string/crop_save"
         android:textColor="@color/white"
         android:textSize="10dip"
diff --git a/res/layout/list_sub_menu.xml b/res/layout/list_sub_menu.xml
index eaab0948e..6d4ff1aff 100644
--- a/res/layout/list_sub_menu.xml
+++ b/res/layout/list_sub_menu.xml
@@ -29,11 +29,8 @@
 <com.android.camera.ui.ListSubMenu xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:alpha="0.85"
     android:background="@drawable/list_border"
-    android:divider="@color/list_divider_color"
-    android:dividerHeight="1dp"
-    android:listSelector="@drawable/list_selector"
+    android:choiceMode="singleChoice"
     android:scrollbars="none" >
 
 </com.android.camera.ui.ListSubMenu>
diff --git a/res/layout/list_sub_menu_item.xml b/res/layout/list_sub_menu_item.xml
index db417d689..f5f5f63c6 100644
--- a/res/layout/list_sub_menu_item.xml
+++ b/res/layout/list_sub_menu_item.xml
@@ -45,10 +45,6 @@
         android:id="@+id/text"
         style="@style/CustomSettingItemTitle"
         android:layout_toRightOf="@+id/image"
-        android:shadowColor="@android:color/transparent"
-        android:shadowDx="1"
-        android:shadowDy="1"
-        android:shadowRadius="2"
         android:textColor="@android:color/white"
         android:textStyle="bold" />
 
diff --git a/res/layout/scene_mode_view.xml b/res/layout/scene_mode_view.xml
index d4c2a259c..88d6e89d4 100644
--- a/res/layout/scene_mode_view.xml
+++ b/res/layout/scene_mode_view.xml
@@ -30,15 +30,13 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="center"
-    android:orientation="vertical"
     android:padding="@dimen/scene_mode_padding" >
 
     <LinearLayout
-        android:id="@+id/border"
         android:layout_width="@dimen/scene_mode_width"
         android:layout_height="@dimen/scene_mode_height"
         android:layout_gravity="center"
-        android:background="@drawable/scene_mode_view_border"
+        android:background="@drawable/scene_filter_item_bg"
         android:orientation="vertical"
         android:padding="2dp" >
 
@@ -54,10 +52,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
-            android:shadowColor="@android:color/black"
-            android:shadowDx="1"
-            android:shadowDy="1"
-            android:shadowRadius="2"
             android:singleLine="true"
             android:textColor="@android:color/white"
             android:textSize="13sp"
diff --git a/res/layout/vertical_grid.xml b/res/layout/vertical_grid.xml
index 0754d0483..9c746f9ed 100644
--- a/res/layout/vertical_grid.xml
+++ b/res/layout/vertical_grid.xml
@@ -29,7 +29,6 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:alpha="0.85"
     android:background="@color/popup_background"
     android:scrollbars="none" >