summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-10-17 14:09:34 -0700
committerSteve Kondik <shade@chemlab.org>2013-10-17 14:09:34 -0700
commit17bd9d3aec795fca96a6aff8974cc5ee194e12b6 (patch)
tree919c9136192243c1103d591184003423e69fb505 /res
parent8a1aced9a1a2d070d3533f95b3bc3dedb1b1f282 (diff)
downloadandroid_packages_apps_Gallery2-17bd9d3aec795fca96a6aff8974cc5ee194e12b6.tar.gz
android_packages_apps_Gallery2-17bd9d3aec795fca96a6aff8974cc5ee194e12b6.tar.bz2
android_packages_apps_Gallery2-17bd9d3aec795fca96a6aff8974cc5ee194e12b6.zip
camera: Add support for high frame rate video
* If the camera supports HFR for the WVGA profile, use it. Change-Id: I3ba03239b66482af36010b75f6827ad9a5b28d30
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml3
-rw-r--r--res/values/cm_strings.xml4
2 files changed, 6 insertions, 1 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7c73a9ec3..c0c9750a0 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -23,6 +23,7 @@
<item>@string/pref_video_quality_entry_480p</item>
<item>@string/pref_video_quality_entry_high</item>
<item>@string/pref_video_quality_entry_low</item>
+ <item>@string/pref_video_quality_entry_hfr</item>
</string-array>
<string-array name="pref_video_quality_entryvalues" translatable="false">
@@ -36,6 +37,7 @@
<item>1</item>
<!-- The integer value of CamcorderProfile.QUALITY_LOW -->
<item>0</item>
+ <item>9</item>
</string-array>
<!-- These values correspond to the time interval between frame capture in millseconds
@@ -533,5 +535,4 @@
<item>@string/pref_camera_countdown_label_ten</item>
<item>@string/pref_camera_countdown_label_fifteen</item>
</string-array>
-
</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 60afd6fcb..e7dc36c01 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -84,4 +84,8 @@
<!-- The tips of trimming video -->
<string name="fail_trim">This video file can not be trimmed</string>
<string name="can_not_trim">Only mp4 files can be trimmed</string>
+
+ <!-- HFR video size -->
+ <string name="pref_video_quality_entry_hfr">WVGA High Frame Rate</string>
+
</resources>