diff options
| author | qimengp <qimengp@codeaurora.org> | 2017-02-28 13:59:57 +0800 |
|---|---|---|
| committer | qimengp <qimengp@codeaurora.org> | 2017-02-28 14:01:32 +0800 |
| commit | a679df892433f8847eb41c89c6a5e846fa0b2883 (patch) | |
| tree | 2c931d04cde91b680dc17dcafb364dd5f818ad8b | |
| parent | 3196565b3091f36a00428c0509c2bfd959c84b85 (diff) | |
| download | android_packages_apps_Snap-a679df892433f8847eb41c89c6a5e846fa0b2883.tar.gz android_packages_apps_Snap-a679df892433f8847eb41c89c6a5e846fa0b2883.tar.bz2 android_packages_apps_Snap-a679df892433f8847eb41c89c6a5e846fa0b2883.zip | |
SnapdragonCamera: ZSL and manual 3A can be on at same time
ZSL and manual 3A can be on at same time
Change-Id: I0fee67ef9169c87564e0cf63ffe65e1836b4dd19
CRs-Fixed: 2012562
| -rwxr-xr-x | src/com/android/camera/PhotoMenu.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 99226b2ec..6e83f6d68 100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -703,12 +703,7 @@ public class PhotoMenu extends MenuController if ((autohdr != null) && autohdr.equals("enable")) { popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE, false); } - if ((zsl != null) && Parameters.ZSL_ON.equals(zsl)) { - popup1.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE, false); - popup1.setPreferenceEnabled(CameraSettings.KEY_MANUAL_EXPOSURE, false); - popup1.setPreferenceEnabled(CameraSettings.KEY_MANUAL_WB, false); - popup1.setPreferenceEnabled(CameraSettings.KEY_MANUAL_FOCUS, false); - } + if ((faceDetection != null) && !Parameters.FACE_DETECTION_ON.equals(faceDetection)) { popup1.setPreferenceEnabled(CameraSettings.KEY_FACE_RECOGNITION, false); } |