From a679df892433f8847eb41c89c6a5e846fa0b2883 Mon Sep 17 00:00:00 2001 From: qimengp Date: Tue, 28 Feb 2017 13:59:57 +0800 Subject: 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 --- src/com/android/camera/PhotoMenu.java | 7 +------ 1 file changed, 1 insertion(+), 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); } -- cgit v1.2.3