diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-12-10 23:24:36 -0800 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-10-20 22:23:02 +0000 |
| commit | 5c1231caa69d7539baec2ac7c6c53ce3b834fbf6 (patch) | |
| tree | 13061fcc2f74b2fcb0cda636697a817e0ce0e600 | |
| parent | 529889fbdfd961c5677cfee140a6471f89804b32 (diff) | |
| download | android_packages_apps_Camera2-5c1231caa69d7539baec2ac7c6c53ce3b834fbf6.tar.gz android_packages_apps_Camera2-5c1231caa69d7539baec2ac7c6c53ce3b834fbf6.tar.bz2 android_packages_apps_Camera2-5c1231caa69d7539baec2ac7c6c53ce3b834fbf6.zip | |
camera: Override color effect when scene mode is active
Change-Id: Ia27ed59f3f27e9c867cbb4c8823abb78b0035047
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 3ecf1ea70..ad0e310b3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1512,9 +1512,10 @@ public class PhotoModule overrideCameraSettings(flashMode, whiteBalance, focusMode, Integer.toString(mParameters.getExposureCompensation()), mParameters.getAutoExposure(), - getSaturationSafe(), getContrastSafe()); + getSaturationSafe(), getContrastSafe(), + mParameters.getColorEffect()); } else { - overrideCameraSettings(null, null, null, null, null, null, null); + overrideCameraSettings(null, null, null, null, null, null, null, null); } } @@ -1522,7 +1523,7 @@ public class PhotoModule final String whiteBalance, final String focusMode, final String exposureMode, final String autoExposure, final String saturation, - final String contrast) { + final String contrast, final String colorEffect) { mUI.overrideSettings( CameraSettings.KEY_FLASH_MODE, flashMode, CameraSettings.KEY_WHITE_BALANCE, whiteBalance, @@ -1530,7 +1531,8 @@ public class PhotoModule CameraSettings.KEY_EXPOSURE, exposureMode, CameraSettings.KEY_AUTOEXPOSURE, autoExposure, CameraSettings.KEY_SATURATION, saturation, - CameraSettings.KEY_CONTRAST, contrast); + CameraSettings.KEY_CONTRAST, contrast, + CameraSettings.KEY_COLOR_EFFECT, colorEffect); if (CameraUtil.needSamsungHDRFormat()){ if (mSceneMode == CameraUtil.SCENE_MODE_HDR) { mUI.overrideSettings(CameraSettings.KEY_EXPOSURE, |