diff options
| author | likaid <likaid@codeaurora.org> | 2015-08-24 14:52:23 +0800 |
|---|---|---|
| committer | likaid <likaid@codeaurora.org> | 2015-08-25 09:18:33 +0800 |
| commit | 1e20b003bfd4975d11e6110c546b4d8c37ecab48 (patch) | |
| tree | 316e84acfb82aea7e94f5c7f0321e13a7c14dc73 /src | |
| parent | 4f4f23a52368b8d828acb04660020fe6894ffe21 (diff) | |
| download | android_packages_apps_Snap-1e20b003bfd4975d11e6110c546b4d8c37ecab48.tar.gz android_packages_apps_Snap-1e20b003bfd4975d11e6110c546b4d8c37ecab48.tar.bz2 android_packages_apps_Snap-1e20b003bfd4975d11e6110c546b4d8c37ecab48.zip | |
SnapdragonCamera: Set color effect as none when turn HDR on
Some color effects has special tone, if do HDR for specific color
effects like Negative, we'll get unreasonable pictures.
Disable the color effect when HDR on and set it as none effect.
Change-Id: I8dca19b081504abaa85728b6d67b85699a184abb
CRs-Fixed: 894360
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 71cb0e46c..b32dc9749 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1765,6 +1765,17 @@ public class PhotoModule String whiteBalance = Parameters.WHITE_BALANCE_AUTO; focusMode = mFocusManager.getFocusMode(); 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)) { + 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(); + } exposureCompensation = Integer.toString(mParameters.getExposureCompensation()); touchAfAec = mCurrTouchAfAec; @@ -1777,9 +1788,6 @@ public class PhotoModule Integer.toString(mParameters.getSharpness()), colorEffect, sceneMode, redeyeReduction, aeBracketing); - if (CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) { - disableLongShot = true; - } } else if (mFocusManager.isZslEnabled()) { focusMode = mParameters.getFocusMode(); overrideCameraSettings(flashMode, null, focusMode, |