summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/values/cm_arrays.xml48
-rw-r--r--res/values/cm_strings.xml25
-rwxr-xr-xres/xml/camera_preferences.xml8
3 files changed, 81 insertions, 0 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 3e700a68f..bb5627e7c 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -40,4 +40,52 @@
<item>10000</item>
<item>0</item>
</string-array>
+
+ <!-- Shutter speed -->
+ <array name="pref_camera_shutter_speed_entries" translatable="false">
+ <item>@string/pref_camera_shutter_speed_entry_0</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_6000</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_4000</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_2000</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_1000</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_500</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_250</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_125</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_60</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_30</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_15</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_8</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_4</item>
+ <item>@string/pref_camera_shutter_speed_entry_1_2</item>
+ <item>@string/pref_camera_shutter_speed_entry_1</item>
+ <item>@string/pref_camera_shutter_speed_entry_2</item>
+ <item>@string/pref_camera_shutter_speed_entry_4</item>
+ <item>@string/pref_camera_shutter_speed_entry_8</item>
+ <item>@string/pref_camera_shutter_speed_entry_15</item>
+ <item>@string/pref_camera_shutter_speed_entry_30</item>
+ </array>
+
+ <string-array name="pref_camera_shutter_speed_entryvalues" translatable="false">
+ <item>0</item>
+ <item>1/6000</item>
+ <item>1/4000</item>
+ <item>1/2000</item>
+ <item>1/1000</item>
+ <item>1/500</item>
+ <item>1/250</item>
+ <item>1/125</item>
+ <item>1/60</item>
+ <item>1/30</item>
+ <item>1/15</item>
+ <item>1/8</item>
+ <item>1/4</item>
+ <item>1/2</item>
+ <item>1</item>
+ <item>2</item>
+ <item>4</item>
+ <item>8</item>
+ <item>15</item>
+ <item>30</item>
+ </string-array>
+
</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 6b2ec335c..bf2766c5b 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -100,4 +100,29 @@
<string name="pref_camera_focustime_entry_10">10s</string>
<string name="pref_camera_focustime_entry_infinite">Infinite</string>
+ <!-- Shutter speed -->
+ <string name="pref_camera_shutter_speed_title">Shutter speed</string>
+ <string name="pref_camera_shutter_speed_default" translatable="false">0</string>
+
+ <string name="pref_camera_shutter_speed_entry_0" translatable="false">0</string>
+ <string name="pref_camera_shutter_speed_entry_1_6000" translatable="false">1/6000</string>
+ <string name="pref_camera_shutter_speed_entry_1_4000" translatable="false">1/4000</string>
+ <string name="pref_camera_shutter_speed_entry_1_2000" translatable="false">1/2000</string>
+ <string name="pref_camera_shutter_speed_entry_1_1000" translatable="false">1/1000</string>
+ <string name="pref_camera_shutter_speed_entry_1_500" translatable="false">1/500</string>
+ <string name="pref_camera_shutter_speed_entry_1_250" translatable="false">1/250</string>
+ <string name="pref_camera_shutter_speed_entry_1_125" translatable="false">1/125</string>
+ <string name="pref_camera_shutter_speed_entry_1_60" translatable="false">1/60</string>
+ <string name="pref_camera_shutter_speed_entry_1_30" translatable="false">1/30</string>
+ <string name="pref_camera_shutter_speed_entry_1_15" translatable="false">1/25</string>
+ <string name="pref_camera_shutter_speed_entry_1_8" translatable="false">1/8</string>
+ <string name="pref_camera_shutter_speed_entry_1_4" translatable="false">1/4</string>
+ <string name="pref_camera_shutter_speed_entry_1_2" translatable="false">1/2</string>
+ <string name="pref_camera_shutter_speed_entry_1" translatable="false">1</string>
+ <string name="pref_camera_shutter_speed_entry_2" translatable="false">2</string>
+ <string name="pref_camera_shutter_speed_entry_4" translatable="false">4</string>
+ <string name="pref_camera_shutter_speed_entry_8" translatable="false">8</string>
+ <string name="pref_camera_shutter_speed_entry_15" translatable="false">15</string>
+ <string name="pref_camera_shutter_speed_entry_30" translatable="false">30</string>
+
</resources>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 8f3efb6fe..f62711332 100755
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -413,6 +413,14 @@
camera:entries="@array/pref_camera2_camera2_entries"
camera:entryValues="@array/pref_camera2_camera2_entryvalues" />
+ <IconListPreference
+ camera:key="pref_camera_shutter_speed_key"
+ camera:defaultValue="@string/pref_camera_shutter_speed_default"
+ camera:title="@string/pref_camera_shutter_speed_title"
+ camera:entries="@array/pref_camera_shutter_speed_entries"
+ camera:singleIcon="@drawable/ic_settings_countdowntimer"
+ camera:entryValues="@array/pref_camera_shutter_speed_entryvalues" />
+
<ListPreference
camera:key="pref_camera_zoom_key"
camera:defaultValue="@string/pref_camera_zoom_default"