summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-08-02 20:16:09 -0700
committerMichael Bestas <mikeioannina@gmail.com>2015-09-17 23:26:01 +0300
commit4c7b1b2eafbf85f959fb477e77e6b667f3a006ae (patch)
tree9f2c326919a443531401f1b6c72a39f01fc86c91
parent936505587f8b83b29548b5d3ac382ff61199e37d (diff)
downloadandroid_packages_apps_Snap-4c7b1b2eafbf85f959fb477e77e6b667f3a006ae.zip
android_packages_apps_Snap-4c7b1b2eafbf85f959fb477e77e6b667f3a006ae.tar.gz
android_packages_apps_Snap-4c7b1b2eafbf85f959fb477e77e6b667f3a006ae.tar.bz2
SnapdragonCamera: Re-enable ZSL after exiting HDR mode
* Make sure to check that HDR was changed before forcing ZSL back on. Change-Id: Ifb76263c3a50b919762fd2a313d6013295c0619f
-rw-r--r--src/com/android/camera/PhotoModule.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 2d2662e..5e3e58a 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -4153,6 +4153,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);
if (!CameraSettings.isZSLHDRSupported(mParameters)) {
//HDR internally uses AE-bracketing. Disable both if not supported.
if (notSame(pref, CameraSettings.KEY_CAMERA_HDR, settingOff) ||
@@ -4161,6 +4162,9 @@ public class PhotoModule
} else if (notSame(pref,CameraSettings.KEY_ZSL,settingOff)) {
mUI.setPreference(CameraSettings.KEY_CAMERA_HDR, settingOff);
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);
}
}