summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-12-07 06:07:02 -0800
committerMichael Bestas <mikeioannina@gmail.com>2015-09-17 23:26:01 +0300
commit09f757a7c83d0e4255828e2a6536656005f284aa (patch)
treed4a62054dbab6f22dc0368b40c54c90cf0a1bf8c /src/com/android/camera/CameraSettings.java
parentb9347d9cf727fa14f9b44adb43e0db60fbe32d8d (diff)
downloadandroid_packages_apps_Snap-09f757a7c83d0e4255828e2a6536656005f284aa.tar.gz
android_packages_apps_Snap-09f757a7c83d0e4255828e2a6536656005f284aa.tar.bz2
android_packages_apps_Snap-09f757a7c83d0e4255828e2a6536656005f284aa.zip
camera: Cleanup and compatibility fixes
* Don't crash for unavailable integer parameters * Kill logspam Change-Id: I6dbcf5560f96ce6173a847501721f589766889bc
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index ac27cc412..70263da20 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -639,6 +639,18 @@ public class CameraSettings {
selectableZoneAf, mParameters.getSupportedSelectableZoneAf());
}
+ if (saturation != null && !CameraUtil.isSupported(mParameters, "saturation")) {
+ removePreference(group, saturation.getKey());
+ }
+
+ if (contrast != null && !CameraUtil.isSupported(mParameters, "contrast")) {
+ removePreference(group, contrast.getKey());
+ }
+
+ if (sharpness != null && !CameraUtil.isSupported(mParameters, "sharpness")) {
+ removePreference(group, sharpness.getKey());
+ }
+
if (mIso != null) {
filterUnsupportedOptions(group,
mIso, mParameters.getSupportedIsoValues());