From 2c6c6174e2363fccb4e4f29b76290e99234fe140 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Tue, 1 Sep 2009 14:51:53 +0800 Subject: First version of on-screen settings for Camera. Change-Id: I6e608b5b2d02abf3d1901160adba188399b03542 --- res/layout/detailsview.xml | 367 ++++++++++++---------------- res/layout/on_screen_menu.xml | 32 +++ res/layout/on_screen_menu_checkbox_item.xml | 42 ++++ res/layout/on_screen_menu_header.xml | 24 ++ res/layout/on_screen_menu_list_item.xml | 38 +++ res/layout/on_screen_submenu_cancel.xml | 29 +++ res/layout/on_screen_submenu_header.xml | 25 ++ res/layout/on_screen_submenu_item.xml | 39 +++ res/values/ids.xml | 22 -- res/values/strings.xml | 3 + 10 files changed, 394 insertions(+), 227 deletions(-) create mode 100644 res/layout/on_screen_menu.xml create mode 100644 res/layout/on_screen_menu_checkbox_item.xml create mode 100644 res/layout/on_screen_menu_header.xml create mode 100644 res/layout/on_screen_menu_list_item.xml create mode 100644 res/layout/on_screen_submenu_cancel.xml create mode 100644 res/layout/on_screen_submenu_header.xml create mode 100644 res/layout/on_screen_submenu_item.xml delete mode 100644 res/values/ids.xml (limited to 'res') 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"> - - - + - - - + - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + - - + + - - + + - - + + - - + + - + android:gravity="right" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/details_image_longitude"/> + - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + 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 @@ + + + + + + + + + + + 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 @@ + + + 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 @@ + + + + + + + + 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 @@ + + + + + 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 @@ + + + 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 @@ + + + + + + + + + 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 @@ - - - - - - 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 @@ Size limit reached. + + Back + -- cgit v1.1