summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorSai Kumar Sanagavarapu <ssanagav@codeaurora.org>2014-10-01 20:44:47 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-07 20:22:01 -0800
commitbf809d3a0e1039c95a186597a22c012db786709b (patch)
tree0d83758d9dad4ed2989fb57c95734498ca476b4f /src/com/android/camera/PhotoMenu.java
parent25dee8bc2d2fc082e11649b3f226e0908dd92ad6 (diff)
downloadandroid_packages_apps_Snap-bf809d3a0e1039c95a186597a22c012db786709b.tar.gz
android_packages_apps_Snap-bf809d3a0e1039c95a186597a22c012db786709b.tar.bz2
android_packages_apps_Snap-bf809d3a0e1039c95a186597a22c012db786709b.zip
SnapdragonCamera: Add support for manual 3A params.
Add UI support to take inputs from user for the following 3A paramters 1. Manual focus : a. Scale mode 0-100 b. Diopter mode 0-10 2.White balance: a. CCT b. RGB gains 3. Exposure control a. ISO b. exposure time Change-Id: I92ea3719fa2224e02943bb2191987c7654aaf9ea
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 0d4643bf7..629d91526 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -137,7 +137,10 @@ public class PhotoMenu extends PieController
CameraSettings.KEY_FLASH_MODE,
CameraSettings.KEY_FOCUS_MODE,
CameraSettings.KEY_REDEYE_REDUCTION,
- CameraSettings.KEY_AE_BRACKET_HDR
+ CameraSettings.KEY_AE_BRACKET_HDR,
+ CameraSettings.KEY_MANUAL_EXPOSURE,
+ CameraSettings.KEY_MANUAL_WB,
+ CameraSettings.KEY_MANUAL_FOCUS
};
PieItem item1 = makeItem(R.drawable.ic_settings_holo_light_01);
@@ -314,6 +317,9 @@ public class PhotoMenu extends PieController
}
if ((zsl != null) && Parameters.ZSL_ON.equals(zsl)) {
popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false);
+ popup3.setPreferenceEnabled(CameraSettings.KEY_MANUAL_EXPOSURE,false);
+ popup3.setPreferenceEnabled(CameraSettings.KEY_MANUAL_WB,false);
+ popup3.setPreferenceEnabled(CameraSettings.KEY_MANUAL_FOCUS,false);
}
if ((faceDetection != null) && !Parameters.FACE_DETECTION_ON.equals(faceDetection)){
popup2.setPreferenceEnabled(CameraSettings.KEY_FACE_RECOGNITION,false);