summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2009-08-03 22:25:29 +0800
committerWu-cheng Li <wuchengli@google.com>2009-08-11 16:15:02 +0800
commit5945773c664ada754ce5eb9239bd4c8bd95ee4b4 (patch)
tree485e4be3e2e2abb05dd5bc9f6b45034c9c962f28 /res
parent6db7f8e12af8def5ddaa49aed55d006d868f81ef (diff)
downloadLegacyCamera-5945773c664ada754ce5eb9239bd4c8bd95ee4b4.zip
LegacyCamera-5945773c664ada754ce5eb9239bd4c8bd95ee4b4.tar.gz
LegacyCamera-5945773c664ada754ce5eb9239bd4c8bd95ee4b4.tar.bz2
Add flash mode setting.
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml14
-rw-r--r--res/values/strings.xml19
-rw-r--r--res/xml/camera_preferences.xml10
3 files changed, 43 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 44af4be..338630b 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -84,4 +84,18 @@
<item>@string/pref_camera_focusmode_value_infinity</item>
</string-array>
+ <!-- Camera Preferences flash mode dialog box entries -->
+ <string-array name="pref_camera_flashmode_entries">
+ <item>@string/pref_camera_flashmode_entry_auto</item>
+ <item>@string/pref_camera_flashmode_entry_on</item>
+ <item>@string/pref_camera_flashmode_entry_off</item>
+ </string-array>
+
+ <!-- Do not localize entryvalues -->
+ <string-array name="pref_camera_flashmode_entryvalues">
+ <item>@string/pref_camera_flashmode_value_auto</item>
+ <item>@string/pref_camera_flashmode_value_on</item>
+ <item>@string/pref_camera_flashmode_value_off</item>
+ </string-array>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e98cdd7..a168075 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -403,6 +403,25 @@
<!-- Settings screen, focus mode dialog title -->
<string name="pref_camera_focusmode_dialogtitle">Focus mode</string>
+ <!-- Default flash mode setting. Do not translate. -->
+ <string name="pref_camera_flashmode_default">auto</string>
+
+ <!-- Settings screen, Select Focus mode title -->
+ <string name="pref_camera_flashmode_title">Select flash mode</string>
+
+ <!-- Settings screen, Focue mode dialog radio button choices -->
+ <string name="pref_camera_flashmode_entry_auto">Auto</string>
+ <string name="pref_camera_flashmode_entry_on">On</string>
+ <string name="pref_camera_flashmode_entry_off">Off</string>
+
+ <!-- Focus mode entry values. Do not translate. -->
+ <string name="pref_camera_flashmode_value_auto">auto</string>
+ <string name="pref_camera_flashmode_value_on">on</string>
+ <string name="pref_camera_flashmode_value_off">off</string>
+
+ <!-- Settings screen, flash mode dialog title -->
+ <string name="pref_camera_flashmode_dialogtitle">Flash mode</string>
+
<!-- Menu item to go to the settings screen -->
<string name="camerasettings">Settings</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index d6d512b..a2f5ec4 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -54,6 +54,8 @@
android:key="pref_camera_picturesize_key"
android:defaultValue="@string/pref_camera_picturesize_default"
android:title="@string/pref_camera_picturesize_title"
+ android:entries="@array/pref_camera_picturesize_entries"
+ android:entryValues="@array/pref_camera_picturesize_entryvalues"
android:dialogTitle="@string/pref_camera_picturesize_dialogtitle" />
<ListPreference
@@ -71,6 +73,14 @@
android:entries="@array/pref_camera_focusmode_entries"
android:entryValues="@array/pref_camera_focusmode_entryvalues"
android:dialogTitle="@string/pref_camera_focusmode_dialogtitle" />
+
+ <ListPreference
+ android:key="pref_camera_flashmode_key"
+ android:defaultValue="@string/pref_camera_flashmode_default"
+ android:title="@string/pref_camera_flashmode_title"
+ android:entries="@array/pref_camera_flashmode_entries"
+ android:entryValues="@array/pref_camera_flashmode_entryvalues"
+ android:dialogTitle="@string/pref_camera_flashmode_dialogtitle" />
</PreferenceCategory>
</PreferenceScreen>