summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2010-03-10 17:14:25 +0800
committerOwen Lin <owenlin@google.com>2010-03-14 19:23:49 +0800
commit469a9ef839e38630e1e652d182f7e0ee5882e277 (patch)
tree1a45462513b9d3a457a5c2bcbd6495bed1c8a961 /res/values
parentc24155c65b45f554ffc29c523d7ea8e63ea10d33 (diff)
downloadLegacyCamera-469a9ef839e38630e1e652d182f7e0ee5882e277.zip
LegacyCamera-469a9ef839e38630e1e652d182f7e0ee5882e277.tar.gz
LegacyCamera-469a9ef839e38630e1e652d182f7e0ee5882e277.tar.bz2
New UI for camcorder.
Change-Id: Id35564836da7b4051662cccfd0920480421499b0
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml42
-rw-r--r--res/values/strings.xml24
2 files changed, 23 insertions, 43 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 42b80f4..34dbcb6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -16,30 +16,27 @@
-->
<resources>
- <!-- Camera Preferences Video Quality dialog box entries -->
- <string-array name="pref_camera_videoquality_entries" translatable="false">
- <item>@string/pref_camera_videoquality_entry_0</item>
- <item>@string/pref_camera_videoquality_entry_1</item>
+ <!-- Camera Preferences Video Quality entries -->
+ <string-array name="pref_video_quality_entries" translatable="false">
+ <item>@string/pref_video_quality_entry_high</item>
+ <item>@string/pref_video_quality_entry_low</item>
+ <item>@string/pref_video_quality_entry_mms</item>
+ <item>@string/pref_video_quality_entry_youtube</item>
</string-array>
- <string-array name="pref_camera_videoquality_entryvalues" translatable="false">
- <item>0</item>
- <item>1</item>
+ <string-array name="pref_video_quality_entryvalues" translatable="false">
+ <item>high</item>
+ <item>low</item>
+ <item>mms</item>
+ <item>youtube</item>
</string-array>
- <!-- Camera Preferences Video Duration dialog box entries -->
- <string-array name="pref_camera_video_duration_entries" translatable="false">
- <item>@string/pref_camera_video_duration_entry_mms</item>
- <item>@string/pref_camera_video_duration_entry_10</item>
- <item>@string/pref_camera_video_duration_entry_30</item>
- </string-array>
-
- <!-- The numbers are in minutes, except -1 means the duration suitable for mms. -->
- <string-array name="pref_camera_video_duration_entryvalues" translatable="false">
- <item>-1</item>
- <item>10</item>
- <item>30</item>
- </string-array>
+ <array name="video_quality_icons" translatable="false">
+ <item>@drawable/ic_viewfinder_video_quality_high</item>
+ <item>@drawable/ic_viewfinder_video_quality_low</item>
+ <item>@drawable/ic_viewfinder_video_quality_mms</item>
+ <item>@drawable/ic_viewfinder_video_quality_youtube</item>
+ </array>
<!-- Camera Preferences Picture size dialog box entries -->
<string-array name="pref_camera_picturesize_entries" translatable="false">
@@ -148,6 +145,11 @@
<item>@drawable/ic_menuselect_flash_off</item>
</array>
+ <array name="video_flashmode_icons">
+ <item>@drawable/ic_viewfinder_flash_on</item>
+ <item>@drawable/ic_viewfinder_flash_off</item>
+ </array>
+
<string-array name="pref_camera_recordlocation_entryvalues" translatable="false">
<item>off</item>
<item>on</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59b7ea3..26ff93f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -124,31 +124,9 @@
<string name="pref_camera_recordlocation_entry_off">Off</string>
<string name="pref_camera_recordlocation_entry_on">On</string>
- <!-- Default video quality setting. A numerical value. -->
- <string name="pref_camera_videoquality_default" translatable="false">1</string>
-
- <!-- Settings screen, Video quality title -->
- <string name="pref_camera_videoquality_title">Video quality</string>
-
- <!-- Settings screen, Video quality dialog radio button choices -->
- <string name="pref_camera_videoquality_entry_0">Low (for MMS messages)</string>
- <string name="pref_camera_videoquality_entry_1">High (for SD card)</string>
-
- <!-- Default video duration setting. A numerical value.-->
- <string name="pref_camera_video_duration_default" translatable="false">10</string>
-
- <!-- Settings screen, Video duration title -->
- <string name="pref_camera_video_duration_title">Video duration</string>
-
- <!-- Settings screen, Video duration dialog radio button choices -->
- <string name="pref_camera_video_duration_entry_mms">
- <xliff:g id="duration" example="60">%1$d</xliff:g> seconds (for MMS)
- </string>
- <string name="pref_camera_video_duration_entry_10">10 minutes</string>
- <string name="pref_camera_video_duration_entry_30">30 minutes</string>
-
<!-- The Video length settings in preference -->
<string name="pref_video_quality_title">Video quality</string>
+ <string name="pref_video_quality_default" translatable="false">high</string>
<string name="pref_video_quality_entry_high">High (30m)</string>
<string name="pref_video_quality_entry_low">Low (30m)</string>
<string name="pref_video_quality_entry_mms">MMS (Low, 30s)</string>