summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorSanthosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>2014-01-10 16:50:32 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2014-01-28 22:35:30 -0800
commit1ad1d65a88e350e6e5461828ab930638b778564d (patch)
treefb31da782bda09581f2194d4e21dd8240627fad0 /src/com/android/camera/CameraSettings.java
parent9050beb9fb9a5f9809ffaa152b7bfdcbbf426d7c (diff)
downloadandroid_packages_apps_Snap-1ad1d65a88e350e6e5461828ab930638b778564d.tar.gz
android_packages_apps_Snap-1ad1d65a88e350e6e5461828ab930638b778564d.tar.bz2
android_packages_apps_Snap-1ad1d65a88e350e6e5461828ab930638b778564d.zip
Camera: Add a filter to remove unsupported hfr modes in camcorder
Some sensors don't support some hfr modes, so in camera setting, a filter should be used to block unnecessary menu items. ( cherrypicked from commit a7536c35e22148ee1def337d36fce0682a347c92 ) Change-Id: I5b243e59c99f4daaa36022867d19782b6e2395eb CRs-Fixed: 598600
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 48775041c..6ce53b720 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -343,6 +343,7 @@ public class CameraSettings {
ListPreference videoSnapSize = group.findPreference(KEY_VIDEO_SNAPSHOT_SIZE);
ListPreference videoHdr = group.findPreference(KEY_VIDEO_HDR);
ListPreference pictureFormat = group.findPreference(KEY_PICTURE_FORMAT);
+ ListPreference hfr = group.findPreference(KEY_VIDEO_HIGH_FRAME_RATE);
if (touchAfAec != null) {
filterUnsupportedOptions(group,
@@ -420,6 +421,12 @@ public class CameraSettings {
filterUnsupportedOptions(group,
pictureFormat, getSupportedPictureFormatLists());
}
+
+ if (hfr != null) {
+ filterUnsupportedOptions(group,
+ hfr, mParameters.getSupportedVideoHighFrameRateModes());
+ }
+
if(advancedFeatures != null) {
filterUnsupportedOptions(group,
advancedFeatures, getSupportedAdvancedFeatures(mParameters));