summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-20 23:58:13 +0200
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:48 +0200
commit726776f56eee0e53321535a287ec2aa4bb3f9090 (patch)
tree4cccfb96c3dd52b6d77e29c27d7680d4f00b8c54 /src/com/android/camera/CameraSettings.java
parent0fb5ded484a10cd8ff4f7051e0f1bab20f1dcd15 (diff)
downloadandroid_packages_apps_Snap-726776f56eee0e53321535a287ec2aa4bb3f9090.tar.gz
android_packages_apps_Snap-726776f56eee0e53321535a287ec2aa4bb3f9090.tar.bz2
android_packages_apps_Snap-726776f56eee0e53321535a287ec2aa4bb3f9090.zip
Snap: Remove auto HDR option when not supported
Change-Id: Iaff1bee5ad6d48df2efe189955ba91bca8ec5c32
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-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 c33151556..45ff41705 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());