First version of on-screen settings for Camera.

Change-Id: I6e608b5b2d02abf3d1901160adba188399b03542

10 files changed, 394 insertions, 227 deletions

diff --git a/res/layout/detailsview.xml b/res/layout/detailsview.xml
index d38ec3b..ff32f91 100644
--- a/res/layout/detailsview.xml
+++ b/res/layout/detailsview.xml
@@ -19,225 +19,182 @@
     android:layout_width="300dip"
     android:layout_height="fill_parent">
 
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:paddingLeft="5dip"
-		android:paddingRight="5dip"
-		android:paddingBottom="10dp">
-		
-		<LinearLayout
-			android:orientation="horizontal"
-			android:gravity="center_vertical"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content">
+    <LinearLayout android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dip"
+            android:paddingRight="5dip"
+            android:paddingBottom="10dp">
 
-			<LinearLayout
-			    android:orientation="horizontal"
-			    android:gravity="center_vertical"
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-                android:background="@drawable/detail_photo_border">
-			    <ImageView
-				    android:id="@+id/details_thumbnail_image"
-				    android:layout_width="64dip"
-				    android:layout_height="64dip"/>
-		    </LinearLayout>
+        <LinearLayout android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
 
-		    <TextView
-		    	android:id="@+id/details_image_title"
-        	   	android:layout_height="wrap_content"
-			   	android:layout_width="wrap_content"
-			   	android:textAppearance="?android:attr/textAppearanceMedium"
-			   	android:paddingLeft="6dip"
-			   	android:layout_weight="1"/>
-		
-		</LinearLayout>
+            <LinearLayout android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/detail_photo_border">
+                <ImageView android:id="@+id/details_thumbnail_image"
+                        android:layout_width="64dip"
+                        android:layout_height="64dip"/>
+            </LinearLayout>
+            <TextView android:id="@+id/details_image_title"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingLeft="6dip"
+                    android:layout_weight="1"/>
+
+        </LinearLayout>
+        <TableLayout android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="5dip"
+                android:layout_marginTop="10dip">
+
+            <TableRow>
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_file_size"/>
+                <TextView android:id="@+id/details_file_size_value"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
+            </TableRow>
 
-		<TableLayout
-		    android:layout_width="fill_parent"
-		    android:layout_height="wrap_content"
-		    android:paddingLeft="5dip"
-		    android:layout_marginTop="10dip">
-		
-		    <TableRow>
-		        <TextView
-				    android:gravity="right"
-				    android:textAppearance="?android:attr/textAppearanceSmall"
-				    android:text="@string/details_file_size"/>
-		        <TextView
-		            android:id="@+id/details_file_size_value"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:paddingLeft="5dip"
-		            android:textColor="?android:attr/textColorPrimary"/>
-		    </TableRow>
-		
-		    <TableRow android:id="@+id/details_resolution_row">
-                <TextView
-		            android:gravity="right"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:text="@string/details_image_resolution"/>
-		        <TextView
-		            android:id="@+id/details_resolution_value"
-        	   	    android:layout_height="wrap_content"
-                            android:layout_width="fill_parent"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:paddingLeft="5dip"
-		            android:textColor="?android:attr/textColorPrimary"/>
-		    </TableRow>
+            <TableRow android:id="@+id/details_resolution_row">
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_image_resolution"/>
+                <TextView android:id="@+id/details_resolution_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="fill_parent"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
+            </TableRow>
             <TableRow android:id="@+id/details_make_row">
-                <TextView
-                    android:gravity="right"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/details_image_make"/>
-                <TextView
-                    android:id="@+id/details_make_value"
-                    android:layout_height="wrap_content"
-                    android:layout_width="fill_parent"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:paddingLeft="5dip"
-                    android:textColor="?android:attr/textColorPrimary"/>
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_image_make"/>
+                <TextView android:id="@+id/details_make_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="fill_parent"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
             </TableRow>
             <TableRow android:id="@+id/details_model_row">
-                <TextView
-                    android:gravity="right"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/details_image_model"/>
-                <TextView
-                    android:id="@+id/details_model_value"
-                    android:layout_height="wrap_content"
-                    android:layout_width="fill_parent"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:paddingLeft="5dip"
-                    android:textColor="?android:attr/textColorPrimary"/>
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_image_model"/>
+                <TextView android:id="@+id/details_model_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="fill_parent"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
             </TableRow>
             <TableRow android:id="@+id/details_whitebalance_row">
-                <TextView
-                    android:gravity="right"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/details_image_whitebalance"/>
-                <TextView
-                    android:id="@+id/details_whitebalance_value"
-                    android:layout_height="wrap_content"
-                    android:layout_width="fill_parent"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:paddingLeft="5dip"
-                    android:textColor="?android:attr/textColorPrimary"/>
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_image_whitebalance"/>
+                <TextView android:id="@+id/details_whitebalance_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="fill_parent"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
             </TableRow>
             <TableRow android:id="@+id/details_latitude_row">
-                <TextView
-                    android:gravity="right"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/details_image_latitude"/>
-                <TextView
-                    android:id="@+id/details_latitude_value"
-                    android:layout_height="wrap_content"
-                    android:layout_width="fill_parent"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:paddingLeft="5dip"
-                    android:textColor="?android:attr/textColorPrimary"/>
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_image_latitude"/>
+                <TextView android:id="@+id/details_latitude_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="fill_parent"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
             </TableRow>
             <TableRow android:id="@+id/details_longitude_row"> <TextView
-                    android:gravity="right"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/details_image_longitude"/>
-                <TextView
-                    android:id="@+id/details_longitude_value"
-                    android:layout_height="wrap_content"
-                    android:layout_width="fill_parent"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:paddingLeft="5dip"
-                    android:textColor="?android:attr/textColorPrimary"/>
+                        android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_image_longitude"/>
+                <TextView android:id="@+id/details_longitude_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="fill_parent"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
             </TableRow>
             <TableRow android:id="@+id/details_location_row">
-                <TextView
-                    android:gravity="right"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:text="@string/details_image_location"/>
-                <TextView
-                    android:id="@+id/details_location_value"
-                    android:layout_height="wrap_content"
-                    android:layout_width="fill_parent"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:paddingLeft="5dip"
-                    android:textColor="?android:attr/textColorPrimary"/>
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_image_location"/>
+                <TextView android:id="@+id/details_location_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="fill_parent"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
+            </TableRow>
+            <TableRow android:id="@+id/details_duration_row">
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_duration"/>
+                <TextView android:id="@+id/details_duration_value"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
+            </TableRow>
+            <TableRow android:id="@+id/details_frame_rate_row">
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_frame_rate"/>
+                <TextView android:id="@+id/details_frame_rate_value"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
             </TableRow>
-		    <TableRow
-		    	android:id="@+id/details_duration_row">
-		        <TextView
-		            android:gravity="right"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:text="@string/details_duration"/>
-		        <TextView
-		            android:id="@+id/details_duration_value"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:paddingLeft="5dip"
-		            android:textColor="?android:attr/textColorPrimary"/>
-		    </TableRow>
-		    <TableRow
-		    	android:id="@+id/details_frame_rate_row">
-		        <TextView
-		            android:gravity="right"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:text="@string/details_frame_rate"/>
-		        <TextView
-		            android:id="@+id/details_frame_rate_value"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:paddingLeft="5dip"
-		            android:textColor="?android:attr/textColorPrimary"/>
-		    </TableRow>
-		
-		    <TableRow
-		    	android:id="@+id/details_bit_rate_row">
-		        <TextView
-		            android:gravity="right"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:text="@string/details_bit_rate"/>
-		        <TextView
-		            android:id="@+id/details_bit_rate_value"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:paddingLeft="5dip"
-		            android:textColor="?android:attr/textColorPrimary"/>
-		    </TableRow>
-		    <TableRow
-		    	android:id="@+id/details_format_row">
-		        <TextView
-		            android:gravity="right"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:text="@string/details_format"/>
-		        <TextView
-		            android:id="@+id/details_format_value"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:paddingLeft="5dip"
-		            android:textColor="?android:attr/textColorPrimary"/>
-		    </TableRow>
-		    <TableRow
-		    	android:id="@+id/details_codec_row">
-		        <TextView
-		            android:gravity="right"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:text="@string/details_codec"/>
-		        <TextView
-		            android:id="@+id/details_codec_value"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:paddingLeft="5dip"
-		            android:textColor="?android:attr/textColorPrimary"/>
-		    </TableRow>
-		    <TableRow
-		    	android:id="@+id/details_date_taken_row">
-		        <TextView
-		            android:gravity="right"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:text="@string/details_date_taken"/>
-		        <TextView
-		            android:id="@+id/details_date_taken_value"
-		            android:textAppearance="?android:attr/textAppearanceSmall"
-		            android:paddingLeft="5dip"
-		            android:textColor="?android:attr/textColorPrimary"/>
-		    </TableRow>
-		</TableLayout>
-
-	</LinearLayout>
 
+            <TableRow android:id="@+id/details_bit_rate_row">
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_bit_rate"/>
+                <TextView android:id="@+id/details_bit_rate_value"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
+            </TableRow>
+            <TableRow android:id="@+id/details_format_row">
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_format"/>
+                <TextView android:id="@+id/details_format_value"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
+            </TableRow>
+            <TableRow android:id="@+id/details_codec_row">
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_codec"/>
+                <TextView android:id="@+id/details_codec_value"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
+            </TableRow>
+            <TableRow android:id="@+id/details_date_taken_row">
+                <TextView android:gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:text="@string/details_date_taken"/>
+                <TextView android:id="@+id/details_date_taken_value"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:paddingLeft="5dip"
+                        android:textColor="?android:attr/textColorPrimary"/>
+            </TableRow>
+        </TableLayout>
+    </LinearLayout>
 </ScrollView>
diff --git a/res/layout/on_screen_menu.xml b/res/layout/on_screen_menu.xml
new file mode 100644
index 0000000..26a9400
--- /dev/null
+++ b/res/layout/on_screen_menu.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:padding="10dip"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+    <ListView android:id="@+id/menu_view"
+            android:background="#88333333"
+            android:cacheColorHint="#00000000"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
+    <ListView android:id="@+id/sub_menu"
+            android:background="#88333333"
+            android:visibility="invisible"
+            android:cacheColorHint="#00000000"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
+</FrameLayout>
diff --git a/res/layout/on_screen_menu_checkbox_item.xml b/res/layout/on_screen_menu_checkbox_item.xml
new file mode 100644
index 0000000..5de3be0
--- /dev/null
+++ b/res/layout/on_screen_menu_checkbox_item.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="10dp"
+        android:paddingRight="5dp" >
+
+    <TextView android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+    <CheckBox android:id="@+id/check_box"
+            android:layout_weight="0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="false"
+            android:focusable="false" />
+</LinearLayout>
+
+
+
diff --git a/res/layout/on_screen_menu_header.xml b/res/layout/on_screen_menu_header.xml
new file mode 100644
index 0000000..d960419
--- /dev/null
+++ b/res/layout/on_screen_menu_header.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/title"
+        android:background="#88111111"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:singleLine="true" />
diff --git a/res/layout/on_screen_menu_list_item.xml b/res/layout/on_screen_menu_list_item.xml
new file mode 100644
index 0000000..f862d01
--- /dev/null
+++ b/res/layout/on_screen_menu_list_item.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingLeft="10dp"
+        android:paddingRight="5dp" >
+
+    <TextView android:id="@+id/title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+    <TextView android:id="@+id/summary"
+            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>
diff --git a/res/layout/on_screen_submenu_cancel.xml b/res/layout/on_screen_submenu_cancel.xml
new file mode 100644
index 0000000..9bcf8a3
--- /dev/null
+++ b/res/layout/on_screen_submenu_cancel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center">
+    <TextView android:id="@+id/cancel"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="@string/on_screen_menu_back" />
+</LinearLayout>
diff --git a/res/layout/on_screen_submenu_header.xml b/res/layout/on_screen_submenu_header.xml
new file mode 100644
index 0000000..860f3ee
--- /dev/null
+++ b/res/layout/on_screen_submenu_header.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/title"
+        android:background="#88222222"
+        android:gravity="center"
+        android:layout_marginRight="5dp"
+        android:layout_marginLeft="5dp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:singleLine="true" />
diff --git a/res/layout/on_screen_submenu_item.xml b/res/layout/on_screen_submenu_item.xml
new file mode 100644
index 0000000..fb28438
--- /dev/null
+++ b/res/layout/on_screen_submenu_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical" >
+    <TextView android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+    <RadioButton android:id="@+id/radio_button"
+            android:focusable="false"
+            android:clickable="false"
+            android:layout_weight="0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+</LinearLayout>
+
+
+
diff --git a/res/values/ids.xml b/res/values/ids.xml
deleted file mode 100644
index 44dfd1a..0000000
--- a/res/values/ids.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-</resources>
-
-
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1bdb3a6..7e0920e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -585,4 +585,7 @@
     <!-- The messsage shown when video record reaches size limit. -->
     <string name="video_reach_size_limit">Size limit reached.</string>
 
+    <!-- The title of the menu item for users to go back to the main menu from the sub menu -->
+    <string name="on_screen_menu_back">Back</string>
+
 </resources>