diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-09-09 22:31:28 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-09-09 22:31:28 -0700 |
| commit | c98fe9f300726321d03cbeaec35f4c37681cf304 (patch) | |
| tree | 5e2b56dee2abaf7e9e5f7206e9bed8790da0f437 /src | |
| parent | a5a395697e8f3589c521a8d18e8cffbdfdf8453f (diff) | |
| parent | 1e20b003bfd4975d11e6110c546b4d8c37ecab48 (diff) | |
| download | android_packages_apps_Snap-c98fe9f300726321d03cbeaec35f4c37681cf304.tar.gz android_packages_apps_Snap-c98fe9f300726321d03cbeaec35f4c37681cf304.tar.bz2 android_packages_apps_Snap-c98fe9f300726321d03cbeaec35f4c37681cf304.zip | |
Merge "SnapdragonCamera: Set color effect as none when turn HDR on"
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 2db71e3c9..9a368880e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1769,6 +1769,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; @@ -1781,9 +1792,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, |