diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-09-01 14:37:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-09-01 14:37:54 -0700 |
| commit | 8c1ad5f993284e888a719e301d50eca41643d0fb (patch) | |
| tree | 799a0996d6ebb4cf9c06798faf30f433b500f61c /src | |
| parent | 053688cc64a0714c1941f16b0624be9978f6cca5 (diff) | |
| parent | ebe3c0a017efd10151b96f4a9be591c1a957a400 (diff) | |
| download | android_packages_apps_Snap-8c1ad5f993284e888a719e301d50eca41643d0fb.tar.gz android_packages_apps_Snap-8c1ad5f993284e888a719e301d50eca41643d0fb.tar.bz2 android_packages_apps_Snap-8c1ad5f993284e888a719e301d50eca41643d0fb.zip | |
Merge "SnapdragonCamera: Allow touch to focus when using opti-zoom"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 5 |
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, |