diff options
| author | weijiew <weijiew@codeaurora.org> | 2017-03-24 14:24:50 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-27 20:09:25 -0700 |
| commit | 464c24158ec1a956eef16e696614aca12bf97f3c (patch) | |
| tree | d147dd2e12c8ee2188b23f3bd965da79ea9a028a /src/com/android/camera/PhotoModule.java | |
| parent | dc6939db58ac5c18b11b589a182a9bb65d29ab84 (diff) | |
| download | android_packages_apps_Snap-464c24158ec1a956eef16e696614aca12bf97f3c.tar.gz android_packages_apps_Snap-464c24158ec1a956eef16e696614aca12bf97f3c.tar.bz2 android_packages_apps_Snap-464c24158ec1a956eef16e696614aca12bf97f3c.zip | |
SnapdragonCamera:Reset the AF mode to CAF when zoom has changed
Reset the AF mode to CAF when zoom has changed
CRs-Fixed: 2020171
Change-Id: Icb056481952708815f06d470fe3ff6be60e8a6e7
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 49cb09936..2b4fb06f9 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4961,6 +4961,10 @@ public class PhotoModule if (mPaused) return index; mZoomValue = index; if (mParameters == null || mCameraDevice == null) return index; + if ( mFocusManager != null + && mFocusManager.getCurrentFocusState() == FocusOverlayManager.STATE_FOCUSING ) { + mFocusManager.cancelAutoFocus(); + } // Set zoom parameters asynchronously synchronized (mCameraDevice) { mParameters.setZoom(mZoomValue); @@ -4973,7 +4977,10 @@ public class PhotoModule @Override public void onZoomChanged(float requestedZoom) { - + if ( mFocusManager != null + && mFocusManager.getCurrentFocusState() == FocusOverlayManager.STATE_FOCUSING ) { + mFocusManager.cancelAutoFocus(); + } } @Override |