diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-02-22 13:35:12 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-07-30 05:05:24 -0700 |
| commit | ebe93e533d3929715585acaf46208c74ef4a70e9 (patch) | |
| tree | 85b5b9748f1ec96627a1eba966f3fa2ae21cb81d | |
| parent | 656585dc19087dac8030d8ad90304318dc9aaeb6 (diff) | |
| download | android_packages_apps_Snap-ebe93e533d3929715585acaf46208c74ef4a70e9.tar.gz android_packages_apps_Snap-ebe93e533d3929715585acaf46208c74ef4a70e9.tar.bz2 android_packages_apps_Snap-ebe93e533d3929715585acaf46208c74ef4a70e9.zip | |
SnapdragonCamera: Disable continuous shot when HDR is enabled
HDR and continuous shot cannot be enabled at the same time. When
HDR scene mode is selected, disable the continuous shot feature
Change-Id: I2ba6d0fd6d09a3cd9de393e7d2c16303d434f972
CRs-Fixed: 979676
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 89f567728..0808bd995 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1866,15 +1866,16 @@ public class PhotoModule focusMode = mFocusManager.getFocusMode(false); colorEffect = mParameters.getColorEffect(); String defaultEffect = mActivity.getString(R.string.pref_camera_coloreffect_default); - if (CameraUtil.SCENE_MODE_HDR.equals(mSceneMode) - && colorEffect != null & !colorEffect.equals(defaultEffect)) { + if (CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) { disableLongShot = true; - // Change the colorEffect to default(None effect) when HDR ON. - colorEffect = defaultEffect; - mUI.setPreference(CameraSettings.KEY_COLOR_EFFECT, colorEffect); - mParameters.setColorEffect(colorEffect); - mCameraDevice.setParameters(mParameters); - mParameters = mCameraDevice.getParameters(); + if (colorEffect != null & !colorEffect.equals(defaultEffect)) { + // Change the colorEffect to default(None effect) when HDR ON. + colorEffect = defaultEffect; + mUI.setPreference(CameraSettings.KEY_COLOR_EFFECT, colorEffect); + mParameters.setColorEffect(colorEffect); + mCameraDevice.setParameters(mParameters); + mParameters = mCameraDevice.getParameters(); + } } exposureCompensation = Integer.toString(mParameters.getExposureCompensation()); |