summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorRyuinferno <ryuinferno.xda@gmail.com>2013-12-26 19:11:23 +0100
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:37 +0200
commit02654c860f290cafbafd2d73977f2ee1f2290e86 (patch)
tree74a67a0d14d14613a31a50506aab3ea9427818d4 /src/com/android/camera/CameraSettings.java
parent2a671f0626f710bf7494de5a2b765231a2a4ddf4 (diff)
downloadandroid_packages_apps_Snap-02654c860f290cafbafd2d73977f2ee1f2290e86.tar.gz
android_packages_apps_Snap-02654c860f290cafbafd2d73977f2ee1f2290e86.tar.bz2
android_packages_apps_Snap-02654c860f290cafbafd2d73977f2ee1f2290e86.zip
Camera2: More thorough compatibility fixes
Certain chipsets (such as omap) have contrast, sharpness and saturation set, but no max integer given for those Change-Id: I58efaef4d0a511aefc803a440e0c3aa3dbdc9483
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index d60939583..1cd965cfa 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -729,15 +729,18 @@ public class CameraSettings {
selectableZoneAf, mParameters.getSupportedSelectableZoneAf());
}
- if (saturation != null && !CameraUtil.isSupported(mParameters, "saturation")) {
+ if (saturation != null && !CameraUtil.isSupported(mParameters, "saturation") &&
+ !CameraUtil.isSupported(mParameters, "saturation-max")) {
removePreference(group, saturation.getKey());
}
- if (contrast != null && !CameraUtil.isSupported(mParameters, "contrast")) {
+ if (contrast != null && !CameraUtil.isSupported(mParameters, "contrast") &&
+ !CameraUtil.isSupported(mParameters, "contrast-max")) {
removePreference(group, contrast.getKey());
}
- if (sharpness != null && !CameraUtil.isSupported(mParameters, "sharpness")) {
+ if (sharpness != null && !CameraUtil.isSupported(mParameters, "sharpness") &&
+ !CameraUtil.isSupported(mParameters, "sharpness-max")) {
removePreference(group, sharpness.getKey());
}