diff options
author | Jack Yoo <jyoo@codeaurora.org> | 2016-03-15 13:40:27 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-08-14 00:05:32 -0700 |
commit | 2e94604fc2fd300ce6fc14d027e6d87eca83d708 (patch) | |
tree | 68107de150de347a7e9b591157cee821e0a8dc5e /src/com/android/camera | |
parent | 1532d76ec2ba6a0e50e6520ed6f4b75cd06a68f3 (diff) | |
download | android_packages_apps_Snap-2e94604fc2fd300ce6fc14d027e6d87eca83d708.tar.gz android_packages_apps_Snap-2e94604fc2fd300ce6fc14d027e6d87eca83d708.tar.bz2 android_packages_apps_Snap-2e94604fc2fd300ce6fc14d027e6d87eca83d708.zip |
SnapdragonCamera: Turn off LONGSHOT on ubifocus scene mode
Turning off LONGSHOT mode to off when ubifocus scene mode
is enabled.
Change-Id: I5a1ce6a2c9fa08715da40a41f4aae694bd7f8654
CRs-Fixed: 984742
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8c41fe35b..c867bc7a8 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1889,12 +1889,14 @@ public class PhotoModule if ((multiTouchFocus != null && multiTouchFocus.equals(multiTouchFocusOn)) || (chromaFlash != null && chromaFlash.equals(chromaFlashOn)) || (optiZoom != null && optiZoom.equals(optiZoomOn)) || + (reFocus != null && reFocus.equals(reFocusOn)) || (fssr != null && fssr.equals(fssrOn)) || (truePortrait != null && truePortrait.equals(truPortraitOn)) || (stillMore != null && stillMore.equals(stillMoreOn))) { if ((optiZoom != null && optiZoom.equals(optiZoomOn)) || (CameraSettings.hasChromaFlashScene(mActivity) && - chromaFlash != null && chromaFlash.equals(chromaFlashOn))) { + chromaFlash != null && chromaFlash.equals(chromaFlashOn)) || + (reFocus != null && reFocus.equals(reFocusOn))) { sceneMode = null; } else { mSceneMode = sceneMode = Parameters.SCENE_MODE_AUTO; |