diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-03-22 03:26:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-03-22 03:26:44 -0700 |
| commit | 9dbe81caeb6849ec47a25aba0162938dbe9ff60b (patch) | |
| tree | b2c8d3cc06391c61b5de1900d59d1e15bba1656e /src/com | |
| parent | 363f950cf0f13bec513d3cc07d3dc9cfe357e8f8 (diff) | |
| parent | 4326bb8e5ee6bd8f88e5ad528ec8e513011d4dd7 (diff) | |
| download | android_packages_apps_Snap-9dbe81caeb6849ec47a25aba0162938dbe9ff60b.tar.gz android_packages_apps_Snap-9dbe81caeb6849ec47a25aba0162938dbe9ff60b.tar.bz2 android_packages_apps_Snap-9dbe81caeb6849ec47a25aba0162938dbe9ff60b.zip | |
Merge "SnapdragonCamera: Turn off LONGSHOT on ubifocus scene mode" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com')
| -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 5a71814a7..1f4ea322c 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1832,10 +1832,12 @@ 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)) { + if ( (optiZoom != null && optiZoom.equals(optiZoomOn)) || + (reFocus != null && reFocus.equals(reFocusOn)) ) { sceneMode = null; } else { mSceneMode = sceneMode = Parameters.SCENE_MODE_AUTO; |