summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-10-17 16:39:39 -0700
committerSteve Kondik <shade@chemlab.org>2013-10-18 00:10:14 -0700
commit7119a0cdbbedf9a4f829d0145fd7ceec58986d36 (patch)
treeb831e57b3ccdbc6b7ed65b68c9bbd244b566d97b /res
parentdbefc606bb869d58b7d157c4267c765756c8e6c8 (diff)
downloadandroid_packages_apps_Gallery2-7119a0cdbbedf9a4f829d0145fd7ceec58986d36.tar.gz
android_packages_apps_Gallery2-7119a0cdbbedf9a4f829d0145fd7ceec58986d36.tar.bz2
android_packages_apps_Gallery2-7119a0cdbbedf9a4f829d0145fd7ceec58986d36.zip
camera: Video HDR mode
* Add option for video HDR mode. * Some cameras claim to support it, but spontaneously combust when enabled, so we'll disable it by default. Change-Id: Ib17ff4cbb0007440ddc994889b8c2242d4d07e43
Diffstat (limited to 'res')
-rw-r--r--res/values/cm_strings.xml2
-rw-r--r--res/values/config.xml2
-rw-r--r--res/xml/video_preferences.xml9
3 files changed, 13 insertions, 0 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index e7dc36c01..8b43a29cf 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -88,4 +88,6 @@
<!-- HFR video size -->
<string name="pref_video_quality_entry_hfr">WVGA High Frame Rate</string>
+ <!-- Video HDR default value -->
+ <string name="pref_camera_video_hdr_default" translatable="false">off</string>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 94c2e4d1a..8aab5e936 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -52,4 +52,6 @@
<bool name="useContinuosFocusForTouch">false</bool>
<!-- A certain beefy device has issues with video snapshots -->
<bool name="useVideoSnapshotWorkaround">false</bool>
+ <!-- Video HDR mode. Aggressively crashes on some hardware -->
+ <bool name="enableVideoHDR">false</bool>
</resources>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 86de6d09a..d2f90e42b 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -75,4 +75,13 @@
camera:largeIcons="@array/camera_recordlocation_largeicons"
camera:entries="@array/pref_camera_recordlocation_entries"
camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
+ <IconListPreference
+ camera:key="pref_camera_video_hdr_key"
+ camera:defaultValue="@string/pref_camera_video_hdr_default"
+ camera:title="@string/pref_camera_scenemode_entry_hdr"
+ camera:entries="@array/pref_camera_hdr_entries"
+ camera:icons="@array/pref_camera_hdr_icons"
+ camera:largeIcons="@array/pref_camera_hdr_icons"
+ camera:labelList="@array/pref_camera_hdr_labels"
+ camera:entryValues="@array/pref_camera_hdr_entryvalues" />
</PreferenceGroup>