summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorIvan Evlogiev <ivanevlogiev@codeaurora.org>2014-06-24 16:47:11 +0300
committerIvan Evlogiev <ivanevlogiev@codeaurora.org>2014-06-30 17:53:45 +0300
commit3d32e20e83c9a81167880f1d19820ee6e585f1d5 (patch)
tree0d6108a5e167b7bcab6cf75bacbd96c5955bde5d /src/com/android/camera/PhotoMenu.java
parentde5dd90a48875ed84371da6eb4354826a3b429e2 (diff)
downloadandroid_packages_apps_Snap-3d32e20e83c9a81167880f1d19820ee6e585f1d5.tar.gz
android_packages_apps_Snap-3d32e20e83c9a81167880f1d19820ee6e585f1d5.tar.bz2
android_packages_apps_Snap-3d32e20e83c9a81167880f1d19820ee6e585f1d5.zip
Camera2: Add support to save Depth map for refocus
Save the Depth map when callback by jpeg, which is bypass in jpeg encode. Change-Id: I9a4e64400b71f35d6fa6638cdfe08a6c40f0046b
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index e8da60c9e..0c22d3201 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -283,6 +283,8 @@ public class PhotoMenu extends PieController
String ubiFocusOn = mActivity.getString(R.string.
pref_camera_advanced_feature_value_ubifocus_on);
+ String reFocusOn = mActivity.getString(R.string.
+ pref_camera_advanced_feature_value_refocus_on);
String chromaFlashOn = mActivity.getString(R.string.
pref_camera_advanced_feature_value_chromaflash_on);
String optiZoomOn = mActivity.getString(R.string.
@@ -302,6 +304,7 @@ public class PhotoMenu extends PieController
} else {
if ((advancedFeatures != null) && (advancedFeatures.equals(ubiFocusOn) ||
advancedFeatures.equals(chromaFlashOn) ||
+ advancedFeatures.equals(reFocusOn) ||
advancedFeatures.equals(optiZoomOn))) {
popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false);
popup3.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false);