diff options
| author | Alok Kediya <kediya@codeaurora.org> | 2013-09-28 16:03:47 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:21 -0600 |
| commit | e111d53de4f9b40ef024deb8af7a0dc0f20e5398 (patch) | |
| tree | ebcc07acbdeb88ca2baf4c0f8d3b773488c098cb /src/com/android/camera/CameraSettings.java | |
| parent | 0dc64ffddb06d0b41e65f10c742caec52e8b0436 (diff) | |
| download | android_packages_apps_Snap-e111d53de4f9b40ef024deb8af7a0dc0f20e5398.tar.gz android_packages_apps_Snap-e111d53de4f9b40ef024deb8af7a0dc0f20e5398.tar.bz2 android_packages_apps_Snap-e111d53de4f9b40ef024deb8af7a0dc0f20e5398.zip | |
Camera: Video HDR Feature Integration
Add Video HDR support on UI.
(cherrypicked from commit 423f0e277390cd4cbb87c89d063820ad0a953631)
Change-Id: I14d2a7002fbaa4859ceb19317490e8843786ce35
(cherry picked from commit b2afb0f26563599e65564dea9605c7bc7d8aa29c)
(cherry picked from commit a31228372a155dc1c02c7fb0669ea350c55c661d)
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -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 9cfb7750d..1049e54f9 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -94,6 +94,7 @@ public class CameraSettings { public static final String KEY_VIDEO_SNAPSHOT_SIZE = "pref_camera_videosnapsize_key"; public static final String KEY_VIDEO_HIGH_FRAME_RATE = "pref_camera_hfr_key"; + public static final String KEY_VIDEO_HDR = "pref_camera_video_hdr_key"; public static final String DEFAULT_VIDEO_QUALITY_VALUE = "custom"; public static final String KEY_SKIN_TONE_ENHANCEMENT = "pref_camera_skinToneEnhancement_key"; public static final String KEY_SKIN_TONE_ENHANCEMENT_FACTOR = "pref_camera_skinToneEnhancement_factor_key"; @@ -218,6 +219,7 @@ public class CameraSettings { ListPreference hdr = group.findPreference(KEY_AE_BRACKET_HDR); ListPreference jpegQuality = group.findPreference(KEY_JPEG_QUALITY); ListPreference videoSnapSize = group.findPreference(KEY_VIDEO_SNAPSHOT_SIZE); + ListPreference videoHdr = group.findPreference(KEY_VIDEO_HDR); if (touchAfAec != null) { @@ -245,6 +247,11 @@ public class CameraSettings { denoise, mParameters.getSupportedDenoiseModes()); } + if (videoHdr != null) { + filterUnsupportedOptions(group, + videoHdr, mParameters.getSupportedVideoHDRModes()); + } + if (colorEffect != null) { filterUnsupportedOptions(group, colorEffect, mParameters.getSupportedColorEffects()); |