From a5340ca1cf6f85a3df76c07501ce9df2564b853c Mon Sep 17 00:00:00 2001
From: codeworkx <codeworkx@cyanogenmod.org>
Date: Wed, 6 Jan 2016 11:35:40 +0100
Subject: Snap: add support for shutter speed

Change-Id: Id3393280c7c1c2f292d71587ba099e8dbafd1340
---
 res/values/cm_arrays.xml       | 48 ++++++++++++++++++++++++++++++++++++++++++
 res/values/cm_strings.xml      | 25 ++++++++++++++++++++++
 res/xml/camera_preferences.xml |  8 +++++++
 3 files changed, 81 insertions(+)

(limited to 'res')

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 94410cf48..d3414355d 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -44,4 +44,52 @@
         <item>30000</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 c665a4fdf..d2d19bef6 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -102,4 +102,29 @@
     <string name="pref_camera_focustime_entry_30">30s</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 5877eeade..ea6612726 100755
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -415,6 +415,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"
-- 
cgit v1.2.3