summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-20 23:58:13 +0200
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:24:50 -0700
commitcd2517ab09ff15fac472110de7994a6c6a3455f0 (patch)
tree5cb85402aafea8e9ba324745ecbc74becebeeaed /src/com
parentf75eec9c31789b6fedf9b885985dd26e46c9fb4f (diff)
downloadandroid_packages_apps_Snap-cd2517ab09ff15fac472110de7994a6c6a3455f0.tar.gz
android_packages_apps_Snap-cd2517ab09ff15fac472110de7994a6c6a3455f0.tar.bz2
android_packages_apps_Snap-cd2517ab09ff15fac472110de7994a6c6a3455f0.zip
Snap: Remove auto HDR option when not supported
Change-Id: Iaff1bee5ad6d48df2efe189955ba91bca8ec5c32
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/CameraSettings.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 1495cb3b7..65f7f44f9 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -897,7 +897,7 @@ public class CameraSettings {
filterSimilarPictureSize(group, videoSnapSize);
}
- if (histogram!= null) {
+ if (histogram != null) {
filterUnsupportedOptions(group,
histogram, mParameters.getSupportedHistogramModes());
}
@@ -907,14 +907,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, mParameters.getSupportedVideoRotationValues());