summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriele M <moto.falcon.git@gmail.com>2016-01-19 16:45:25 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-01-20 15:27:48 -0800
commit5d94a49959bffc1c1e1cce63b02dccd994f00ade (patch)
tree4dcab249bcf1a82d91e55a4a3d549fa600274914
parent4a42fc4785a1ad2edfa840adfac61825c56d9d97 (diff)
downloadandroid_packages_apps_Snap-5d94a49959bffc1c1e1cce63b02dccd994f00ade.zip
android_packages_apps_Snap-5d94a49959bffc1c1e1cce63b02dccd994f00ade.tar.gz
android_packages_apps_Snap-5d94a49959bffc1c1e1cce63b02dccd994f00ade.tar.bz2
Snap: Don't enable ZSL when disabling HDR
Instead, restore the default value. This prevents issues on devices that don't support ZSL. Change-Id: I9c456cd6503df29800e2bc7ccaa691cb3fb42681
-rw-r--r--src/com/android/camera/PhotoModule.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 825e3ed..077436b 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -4203,6 +4203,7 @@ public class PhotoModule
//filter off unsupported settings
final String settingOff = mActivity.getString(R.string.setting_off_value);
final String settingOn = mActivity.getString(R.string.setting_on_value);
+ final String zsl = mActivity.getString(R.string.pref_camera_zsl_default);
if (!CameraSettings.isZSLHDRSupported(mParameters)) {
//HDR internally uses AE-bracketing. Disable both if not supported.
if (notSame(pref, CameraSettings.KEY_CAMERA_HDR, settingOff) ||
@@ -4213,7 +4214,7 @@ public class PhotoModule
mUI.setPreference(CameraSettings.KEY_AE_BRACKET_HDR, settingOff);
} else if (notSame(pref, CameraSettings.KEY_CAMERA_HDR, settingOn) ||
notSame(pref, CameraSettings.KEY_AE_BRACKET_HDR, settingOn)) {
- mUI.setPreference(CameraSettings.KEY_ZSL,settingOn);
+ mUI.setPreference(CameraSettings.KEY_ZSL, zsl);
}
}