summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureMenu.java
diff options
context:
space:
mode:
authorCullum Baldwin <cullumb@codeaurora.org>2016-04-12 11:49:50 -0700
committerByunghun Jeon <bjeon@codeaurora.org>2016-04-12 17:15:13 -0700
commit435d6e5d845c0fe6adb554b9b26b3342c3299a1a (patch)
tree1c76b72ee5caff193e344f8f7834f5bd25269065 /src/com/android/camera/CaptureMenu.java
parentabfa9e762b0b6d298726ecd46c8d7fd59b69b957 (diff)
downloadandroid_packages_apps_Snap-435d6e5d845c0fe6adb554b9b26b3342c3299a1a.tar.gz
android_packages_apps_Snap-435d6e5d845c0fe6adb554b9b26b3342c3299a1a.tar.bz2
android_packages_apps_Snap-435d6e5d845c0fe6adb554b9b26b3342c3299a1a.zip
SnapdragonCamera: Add support for ClearSight capture
Add support to capture ClearSight images. CRs-Fixed: 993611 Change-Id: Ifaeafa53ee5d095fe322e48f968cdeec03c64077
Diffstat (limited to 'src/com/android/camera/CaptureMenu.java')
-rw-r--r--src/com/android/camera/CaptureMenu.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureMenu.java b/src/com/android/camera/CaptureMenu.java
index 99f919a79..8b8f5c357 100644
--- a/src/com/android/camera/CaptureMenu.java
+++ b/src/com/android/camera/CaptureMenu.java
@@ -97,7 +97,8 @@ public class CaptureMenu extends MenuController
CameraSettings.KEY_CAMERA_SAVEPATH,
CameraSettings.KEY_WHITE_BALANCE,
CameraSettings.KEY_CAMERA2,
- CameraSettings.KEY_DUAL_CAMERA
+ CameraSettings.KEY_DUAL_CAMERA,
+ CameraSettings.KEY_CLEARSIGHT
};
//Todo: 2nd string to contain only developer settings
@@ -109,6 +110,7 @@ public class CaptureMenu extends MenuController
CameraSettings.KEY_WHITE_BALANCE,
CameraSettings.KEY_CAMERA2,
CameraSettings.KEY_DUAL_CAMERA,
+ CameraSettings.KEY_CLEARSIGHT,
CameraSettings.KEY_MONO_PREVIEW
};
@@ -398,6 +400,8 @@ public class CaptureMenu extends MenuController
if (!pref.getValue().equals("dual")) {
setPreference(CameraSettings.KEY_MONO_PREVIEW, "off");
mListMenu.setPreferenceEnabled(CameraSettings.KEY_MONO_PREVIEW, false);
+ setPreference(CameraSettings.KEY_CLEARSIGHT, "off");
+ mListMenu.setPreferenceEnabled(CameraSettings.KEY_CLEARSIGHT, false);
}
if (mListener != null) {
@@ -555,6 +559,9 @@ public class CaptureMenu extends MenuController
if (value.equals("on")) {
} else if (value.equals("off")) {
}
+ } else if (key.equals(CameraSettings.KEY_CLEARSIGHT)) {
+ // restart module to re-create sessions and callbacks
+ mActivity.onModuleSelected(ModuleSwitcher.CAPTURE_MODULE_INDEX);
}
}