diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-02-10 02:03:35 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-02-10 02:03:35 -0800 |
| commit | cc1d00ec9306187cbe7fce0e6ba5446aeaaa98db (patch) | |
| tree | 632f1254b78fa5e493e04cfaa448b63887136cbf /src/com/android/camera | |
| parent | 403df9af8bfb0a6e5eba97d620f82bf3c34645d6 (diff) | |
| parent | 1ad1d65a88e350e6e5461828ab930638b778564d (diff) | |
| download | android_packages_apps_Snap-cc1d00ec9306187cbe7fce0e6ba5446aeaaa98db.tar.gz android_packages_apps_Snap-cc1d00ec9306187cbe7fce0e6ba5446aeaaa98db.tar.bz2 android_packages_apps_Snap-cc1d00ec9306187cbe7fce0e6ba5446aeaaa98db.zip | |
Merge "Camera: Add a filter to remove unsupported hfr modes in camcorder"
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 7 |
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)); |