summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-20 23:58:13 +0200
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-02-20 14:32:18 -0800
commit5095288942c7a41a268c9792df556abe5ab203f2 (patch)
tree74de70072e2631e5a6ec46ccfd6ad327741ef3c0 /src
parent2a9565943325791a3a10462e70e9f027b7bec50c (diff)
downloadandroid_packages_apps_Snap-5095288942c7a41a268c9792df556abe5ab203f2.zip
android_packages_apps_Snap-5095288942c7a41a268c9792df556abe5ab203f2.tar.gz
android_packages_apps_Snap-5095288942c7a41a268c9792df556abe5ab203f2.tar.bz2
Snap: Remove auto HDR option when not supported
Change-Id: Iaff1bee5ad6d48df2efe189955ba91bca8ec5c32
Diffstat (limited to 'src')
-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 949c1a5..b1020ae 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -803,7 +803,7 @@ public class CameraSettings {
mParameters.getSupportedPictureSizes()));
}
- if (histogram!= null) {
+ if (histogram != null) {
filterUnsupportedOptions(group,
histogram, mParameters.getSupportedHistogramModes());
}
@@ -813,14 +813,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());