diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2016-01-19 16:45:25 +0100 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 12:24:14 -0700 |
| commit | d1f504bb1193f668f24a1e2a1fdbf9a7af027299 (patch) | |
| tree | 618dd02491b3e22f1f0ebc26b29bfa054e0ae40f /src/com/android/camera | |
| parent | 9ae0a4949df1f30cfb271e67d998c9cb9c13a5f0 (diff) | |
| download | android_packages_apps_Snap-d1f504bb1193f668f24a1e2a1fdbf9a7af027299.tar.gz android_packages_apps_Snap-d1f504bb1193f668f24a1e2a1fdbf9a7af027299.tar.bz2 android_packages_apps_Snap-d1f504bb1193f668f24a1e2a1fdbf9a7af027299.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
Diffstat (limited to 'src/com/android/camera')
| -rwxr-xr-x | 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 3123bfd36..855482e72 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4644,6 +4644,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) || @@ -4654,7 +4655,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); } } |