From a679d2c05164a70f27df58e314d6f675fe5b97bb Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 20 Feb 2016 23:58:13 +0200 Subject: Snap: Remove auto HDR option when not supported Change-Id: Iaff1bee5ad6d48df2efe189955ba91bca8ec5c32 --- src/com/android/camera/CameraSettings.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 5d7084a23..11124ab6b 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -965,7 +965,7 @@ public class CameraSettings { filterSimilarPictureSize(group, videoSnapSize); } - if (histogram!= null) { + if (histogram != null) { filterUnsupportedOptions(group, histogram, ParametersWrapper.getSupportedHistogramModes(mParameters)); } @@ -975,14 +975,19 @@ public class CameraSettings { pictureFormat, getSupportedPictureFormatLists()); } - if(advancedFeatures != null) { + if (advancedFeatures != null) { filterUnsupportedOptions(group, advancedFeatures, getSupportedAdvancedFeatures(mParameters)); } - if (longShot!= null && !isLongshotSupported(mParameters)) { + + if (longShot != null && !isLongshotSupported(mParameters)) { removePreference(group, longShot.getKey()); } + if (auto_hdr != null && !CameraUtil.isAutoHDRSupported(mParameters)) { + removePreference(group, auto_hdr.getKey()); + } + if (videoRotation != null) { filterUnsupportedOptions(group, videoRotation, ParametersWrapper.getSupportedVideoRotationValues(mParameters)); -- cgit v1.2.3