diff options
author | Gabriele M <moto.falcon.git@gmail.com> | 2016-01-19 16:45:25 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:03:06 +0100 |
commit | d36d5110a9f34c6115ed7a9c45daf1608429205a (patch) | |
tree | 583eceb13be1c45ea5dd1eb81d8f7bf719ea88fc | |
parent | 06bb887ec9eb52060300604ba81c0ef35c122065 (diff) | |
download | android_packages_apps_Snap-d36d5110a9f34c6115ed7a9c45daf1608429205a.tar.gz android_packages_apps_Snap-d36d5110a9f34c6115ed7a9c45daf1608429205a.tar.bz2 android_packages_apps_Snap-d36d5110a9f34c6115ed7a9c45daf1608429205a.zip |
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.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index a82f81145..d879ed614 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4938,6 +4938,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) || @@ -4948,7 +4949,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); } } |