diff options
| author | Ethan Chen <intervigil@gmail.com> | 2014-02-05 23:02:17 -0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:02 +0300 |
| commit | 29de2baf38372023965694610dcbfe3b35855ca9 (patch) | |
| tree | 12e17c96155048fa14bf0aad9f91f9deffd47f83 | |
| parent | 1c2ff71cbdf1713425b86e925764c0505ec1ed43 (diff) | |
| download | android_packages_apps_Snap-29de2baf38372023965694610dcbfe3b35855ca9.tar.gz android_packages_apps_Snap-29de2baf38372023965694610dcbfe3b35855ca9.tar.bz2 android_packages_apps_Snap-29de2baf38372023965694610dcbfe3b35855ca9.zip | |
Camera: Fix saturation, contrast, sharpness parameters
* Old-style QCOM HALs use <setting>-max, new style HALs use
max-<setting> for these parameters.
Change-Id: I3b0dbd04f072cb69d09c44b5b3af1097560205b3
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 7d92e3c12..c14f01991 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -640,17 +640,17 @@ public class CameraSettings { } if (saturation != null && !CameraUtil.isSupported(mParameters, "saturation") && - !CameraUtil.isSupported(mParameters, "saturation-max")) { + !CameraUtil.isSupported(mParameters, "max-saturation")) { removePreference(group, saturation.getKey()); } if (contrast != null && !CameraUtil.isSupported(mParameters, "contrast") && - !CameraUtil.isSupported(mParameters, "contrast-max")) { + !CameraUtil.isSupported(mParameters, "max-contrast")) { removePreference(group, contrast.getKey()); } if (sharpness != null && !CameraUtil.isSupported(mParameters, "sharpness") && - !CameraUtil.isSupported(mParameters, "sharpness-max")) { + !CameraUtil.isSupported(mParameters, "max-sharpness")) { removePreference(group, sharpness.getKey()); } diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c7708931e..15e69afe0 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2844,7 +2844,7 @@ public class PhotoModule } //Set Saturation if (CameraUtil.isSupported(mParameters, "saturation") && - CameraUtil.isSupported(mParameters, "saturation-max")) { + CameraUtil.isSupported(mParameters, "max-saturation")) { String saturationStr = mPreferences.getString( CameraSettings.KEY_SATURATION, mActivity.getString(R.string.pref_camera_saturation_default)); @@ -2856,7 +2856,7 @@ public class PhotoModule } // Set contrast parameter. if (CameraUtil.isSupported(mParameters, "contrast") && - CameraUtil.isSupported(mParameters, "contrast-max")) { + CameraUtil.isSupported(mParameters, "max-contrast")) { String contrastStr = mPreferences.getString( CameraSettings.KEY_CONTRAST, mActivity.getString(R.string.pref_camera_contrast_default)); @@ -2868,7 +2868,7 @@ public class PhotoModule } // Set sharpness parameter if (CameraUtil.isSupported(mParameters, "sharpness") && - CameraUtil.isSupported(mParameters, "sharpness-max")) { + CameraUtil.isSupported(mParameters, "max-sharpness")) { String sharpnessStr = mPreferences.getString( CameraSettings.KEY_SHARPNESS, mActivity.getString(R.string.pref_camera_sharpness_default)); |