Camera: Add a feature to choose where to store the picture and video

Add a feature to choose use SDcard or phone to store picture
and video captured by camera and camcorder.

Some of the changes are taken from:
I987a691c93edc4250fe0366d0623c85ea0152117

CRs-Fixed: 619806

Change-Id: I009df4c70f0a1b49b20750f806c799f025bb6197

4 files changed, 29 insertions, 0 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c740d26be..d841d39a8 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -59,6 +59,17 @@
         <item>2</item>
     </string-array>
 
+    <!-- Camera Preference save path entries -->
+    <string-array name="pref_camera_savepath_entries" translatable="false">
+        <item>@string/pref_camera_savepath_entry_0</item>
+        <item>@string/pref_camera_savepath_entry_1</item>
+    </string-array>
+
+    <string-array name="pref_camera_savepath_entryvalues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
     <!-- These values correspond to the time interval between frame capture in millseconds
     for time lapse recording -->
     <string-array name="pref_video_time_lapse_frame_interval_entryvalues" translatable="false">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dc23bc1aa..370254961 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -219,6 +219,12 @@
     <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
     <string name="pref_camera_timer_sound_title">Beep during countdown</string>
 
+    <!-- Entry of camera save path -->
+    <string name="pref_camera_savepath_title">Storage Position</string>
+    <string name="pref_camera_savepath_default">0</string>
+    <string name="pref_camera_savepath_entry_0">Phone</string>
+    <string name="pref_camera_savepath_entry_1">SD Card</string>
+
     <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
     <string name="setting_off">Off</string>
     <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index c6ac85929..c3afedecf 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -225,6 +225,12 @@
             camera:entries="@array/pref_camera_zsl_entries"
             camera:entryValues="@array/pref_camera_zsl_entryvalues" />
     <ListPreference
+            camera:key="pref_camera_savepath_key"
+            camera:defaultValue="@string/pref_camera_savepath_default"
+            camera:title="@string/pref_camera_savepath_title"
+            camera:entries="@array/pref_camera_savepath_entries"
+            camera:entryValues="@array/pref_camera_savepath_entryvalues" />
+    <ListPreference
             camera:key="pref_camera_videosnapsize_key"
             camera:title="@string/pref_camera_picturesize_title"
             camera:defaultValue="@string/pref_camera_videosnapsize_default"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index ab876b81c..2ea5fa1ba 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -126,4 +126,10 @@
             camera:title="@string/pref_camera_picturesize_title"
             camera:entries="@array/pref_camera_picturesize_entries"
             camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_savepath_key"
+            camera:defaultValue="@string/pref_camera_savepath_default"
+            camera:title="@string/pref_camera_savepath_title"
+            camera:entries="@array/pref_camera_savepath_entries"
+            camera:entryValues="@array/pref_camera_savepath_entryvalues" />
 </PreferenceGroup>