Merge "SnapdraongCamera:add HEIF support" into camera-SnapdragonCamera.lnx.2.0

4 files changed, 33 insertions, 0 deletions

diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index e05303325..2916736cf 100755
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -508,6 +508,16 @@
         <item>320x240</item>
     </string-array>
 
+    <string-array name="pref_camera2_picture_format_entries" translatable="false">
+        <item>@string/pref_camera2_picture_format_entry_0</item>
+        <item>@string/pref_camera2_picture_format_entry_1</item>
+    </string-array>
+
+    <string-array name="pref_camera2_picture_format_entryvalues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
     <!-- Camera Preferences focus mode dialog box entries -->
     <string-array name="pref_camera2_focusmode_entries" translatable="false">
         <item>@string/pref_camera_focusmode_entry_auto</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index bf6deb455..46cc2ab9d 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1258,6 +1258,11 @@
     <string name="pref_camera2_video_hdr_entry_value_enable" translatable="false">1</string>
     <string name="pref_camera2_video_hdr_entry_value_disable" translatable="false">0</string>
 
+    <string name="pref_camera2_picture_format_title">Picture Format</string>
+    <string name="pref_camera2_picture_format_default">0</string>
+    <string name="pref_camera2_picture_format_entry_0">JPEG</string>
+    <string name="pref_camera2_picture_format_entry_1">HEIF</string>
+
     <string name="pref_camera2_deepportrait_entry_value_disable" translatable="false">off</string>
     <string name="pref_camera2_deepportrait_entry_value_enable" translatable="false">on</string>
     <string name="pref_camera_scenemode_entry_deepportrait" translatable="false">Deepportrait</string>
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 9050f6319..fb233d3c6 100755
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -157,6 +157,14 @@
         camera:title="@string/pref_camera_picturesize_title"/>
 
     <IconListPreference
+        camera:defaultValue="@string/pref_camera2_picture_format_default"
+        camera:entries="@array/pref_camera2_picture_format_entries"
+        camera:entryValues="@array/pref_camera2_picture_format_entryvalues"
+        camera:key="pref_camera2_picture_format_key"
+        camera:singleIcon="@drawable/ic_settings_storage"
+        camera:title="@string/pref_camera2_picture_format_title"/>
+
+    <IconListPreference
         camera:defaultValue="@string/pref_exposure_default"
         camera:key="pref_camera2_exposure_key"
         camera:singleIcon="@drawable/ic_settings_exposure"
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index 0036c11b2..9daaf3178 100755
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -141,6 +141,16 @@
             android:layout="@layout/preference"
             android:title="@string/pref_camera2_shutter_sound_title" />
 
+        <ListPreference
+            android:defaultValue="@string/pref_camera2_picture_format_default"
+            android:entries="@array/pref_camera2_picture_format_entries"
+            android:entryValues="@array/pref_camera2_picture_format_entryvalues"
+            android:icon="@drawable/ic_settings_storage"
+            android:key="pref_camera2_picture_format_key"
+            android:layout="@layout/preference"
+            android:summary="%s"
+            android:title="@string/pref_camera2_picture_format_title"/>
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="pref_camera2_mono_only_key"