diff options
author | Ivan Evlogiev <ivanevlogiev@codeaurora.org> | 2014-09-11 13:31:11 +0300 |
---|---|---|
committer | Ivan Evlogiev <ivanevlogiev@codeaurora.org> | 2014-09-11 18:16:58 +0300 |
commit | ec449be018e9ff0f644d3484e61334a9667f82a6 (patch) | |
tree | 1dd1a8fad82fba273e92b09cfb77a251e0299fa2 /src/com/android/camera/CameraSettings.java | |
parent | 7c0e9cc3c2f60eced35ad5c475fae22ea27341bf (diff) | |
download | android_packages_apps_Snap-ec449be018e9ff0f644d3484e61334a9667f82a6.tar.gz android_packages_apps_Snap-ec449be018e9ff0f644d3484e61334a9667f82a6.tar.bz2 android_packages_apps_Snap-ec449be018e9ff0f644d3484e61334a9667f82a6.zip |
SnapdragonCamera: Add HDR need 1x menu selection
- HDR need 1x can be true (default) or false
Change-Id: I184ad034d61165becb9fb95a0963e8e8c0752558
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index c0c8a4092..1232d09ac 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -96,6 +96,7 @@ public class CameraSettings { public static final String KEY_AE_BRACKET_HDR = "pref_camera_ae_bracket_hdr_key"; public static final String KEY_ADVANCED_FEATURES = "pref_camera_advanced_features_key"; public static final String KEY_HDR_MODE = "pref_camera_hdr_mode_key"; + public static final String KEY_HDR_NEED_1X = "pref_camera_hdr_need_1x_key"; 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"; @@ -117,6 +118,7 @@ public class CameraSettings { private static final String KEY_QC_SUPPORTED_FACE_RECOGNITION_MODES = "face-recognition-values"; private static final String KEY_QC_SUPPORTED_DIS_MODES = "dis-values"; private static final String KEY_SNAPCAM_SUPPORTED_HDR_MODES = "hdr-mode-values"; + private static final String KEY_SNAPCAM_SUPPORTED_HDR_NEED_1X = "hdr-need-1x-values"; public static final String KEY_QC_AE_BRACKETING = "ae-bracket-hdr"; public static final String KEY_QC_AF_BRACKETING = "af-bracket"; public static final String KEY_QC_RE_FOCUS = "re-focus"; @@ -127,6 +129,7 @@ public class CameraSettings { public static final String KEY_QC_FACE_RECOGNITION = "face-recognition"; public static final String KEY_QC_DIS_MODE = "dis"; public static final String KEY_SNAPCAM_HDR_MODE = "hdr-mode"; + public static final String KEY_SNAPCAM_HDR_NEED_1X = "hdr-need-1x"; public static final String KEY_VIDEO_HSR = "video-hsr"; public static final String KEY_INTERNAL_PREVIEW_RESTART = "internal-restart"; @@ -281,6 +284,14 @@ public class CameraSettings { return split(str); } + public static List<String> getSupportedHDRNeed1x(Parameters params) { + String str = params.get(KEY_SNAPCAM_SUPPORTED_HDR_NEED_1X); + if (str == null) { + return null; + } + return split(str); + } + public List<String> getSupportedAdvancedFeatures(Parameters params) { String str = params.get(KEY_QC_SUPPORTED_AF_BRACKETING_MODES); str += ',' + params.get(KEY_QC_SUPPORTED_CF_MODES); @@ -380,6 +391,12 @@ public class CameraSettings { ListPreference longShot = group.findPreference(KEY_LONGSHOT); ListPreference auto_hdr = group.findPreference(KEY_AUTO_HDR); ListPreference hdr_mode = group.findPreference(KEY_HDR_MODE); + ListPreference hdr_need_1x = group.findPreference(KEY_HDR_NEED_1X); + + if (hdr_need_1x != null) { + filterUnsupportedOptions(group, + hdr_need_1x, getSupportedHDRNeed1x(mParameters)); + } if (hdr_mode != null) { filterUnsupportedOptions(group, |