Skip to content

Camera: Fix saturation, contrast, sharpness parameters #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iiD4x wants to merge 1 commit into
base: kk4.4
Choose a base branch
from
Open

Camera: Fix saturation, contrast, sharpness parameters #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/com/android/camera/CameraSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,17 +392,17 @@ private void initAdditionalPreferences(PreferenceGroup group){
}

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());
}

if (saturation != null && !CameraUtil.isSupported(mParameters, "saturation") &&
!CameraUtil.isSupported(mParameters, "saturation-max")) {
!CameraUtil.isSupported(mParameters, "max-saturation")) {
removePreference(group, saturation.getKey());
}

Expand Down
6 changes: 3 additions & 3 deletions src/com/android/camera/PhotoModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2268,7 +2268,7 @@ private void updateAdditionalCameraParametersPreference() {
}
//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));
Expand All @@ -2280,7 +2280,7 @@ private void updateAdditionalCameraParametersPreference() {
}
// 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));
Expand All @@ -2292,7 +2292,7 @@ private void updateAdditionalCameraParametersPreference() {
}
// 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));
Expand Down