diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-12-10 23:24:36 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-12-10 23:24:36 -0800 |
| commit | f7a73ff0a9bcda17996d10f1b84acc8cab4cc504 (patch) | |
| tree | 4d8e591c99738f3843bf4b9eac71aa29238dbd08 | |
| parent | 0df1be90307d969efe0efd713b79667e41f26729 (diff) | |
| download | android_packages_apps_Gallery2-f7a73ff0a9bcda17996d10f1b84acc8cab4cc504.tar.gz android_packages_apps_Gallery2-f7a73ff0a9bcda17996d10f1b84acc8cab4cc504.tar.bz2 android_packages_apps_Gallery2-f7a73ff0a9bcda17996d10f1b84acc8cab4cc504.zip | |
camera: Override color effect when scene mode is active
Change-Id: Ia27ed59f3f27e9c867cbb4c8823abb78b0035047
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index af7ef60ec..f662ed13b 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1173,18 +1173,21 @@ public class PhotoModule if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode) || CameraSettings.isSlowShutterEnabled(mParameters)) { overrideCameraSettings(mParameters.getFlashMode(), - mParameters.getWhiteBalance(), mParameters.getFocusMode()); + mParameters.getWhiteBalance(), mParameters.getFocusMode(), + mParameters.getColorEffect()); } else { - overrideCameraSettings(null, null, null); + overrideCameraSettings(null, null, null, null); } } private void overrideCameraSettings(final String flashMode, - final String whiteBalance, final String focusMode) { + final String whiteBalance, final String focusMode, + final String colorEffect) { mUI.overrideSettings( CameraSettings.KEY_FLASH_MODE, flashMode, CameraSettings.KEY_WHITE_BALANCE, whiteBalance, - CameraSettings.KEY_FOCUS_MODE, focusMode); + CameraSettings.KEY_FOCUS_MODE, focusMode, + CameraSettings.KEY_COLOR_EFFECT, colorEffect); if (Util.needSamsungHDRFormat()){ if (mSceneMode == Util.SCENE_MODE_HDR) { mUI.overrideSettings(CameraSettings.KEY_EXPOSURE, |