summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2015-09-01 10:30:35 -0700
committerByunghun Jeon <bjeon@codeaurora.org>2015-09-01 10:54:14 -0700
commitebe3c0a017efd10151b96f4a9be591c1a957a400 (patch)
tree8e74b453335e30486b1522d1abddb03893a8fbf0 /src
parentc68df0f4b9fdc0037bc8c9a6cc2f5bd20c259fc4 (diff)
downloadandroid_packages_apps_Snap-ebe3c0a017efd10151b96f4a9be591c1a957a400.tar.gz
android_packages_apps_Snap-ebe3c0a017efd10151b96f4a9be591c1a957a400.tar.bz2
android_packages_apps_Snap-ebe3c0a017efd10151b96f4a9be591c1a957a400.zip
SnapdragonCamera: Allow touch to focus when using opti-zoom
Allow touch to focus when using opti-zoom Change-Id: Id8f40a395626eea3973e6b728f1fa581acf64633 CRs-Fixed: 900256
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 71cb0e46c..cdeb490ed 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2780,9 +2780,12 @@ public class PhotoModule
CameraSettings.KEY_LONGSHOT,
mActivity.getString(R.string.pref_camera_longshot_default));
mParameters.set("long-shot", longshot_enable);
+ String optizoomOn = mActivity.getString(R.string
+ .pref_camera_advanced_feature_value_optizoom_on);
if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode) ||
- CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) {
+ CameraUtil.SCENE_MODE_HDR.equals(mSceneMode) ||
+ optizoomOn.equals(mSceneMode)) {
// Set Touch AF/AEC parameter.
String touchAfAec = mPreferences.getString(
CameraSettings.KEY_TOUCH_AF_AEC,