diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-12-03 18:33:47 +0530 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:48 +0200 |
| commit | 0fb5ded484a10cd8ff4f7051e0f1bab20f1dcd15 (patch) | |
| tree | 38bc83b51757860858210bc5b62131a4d98500d2 /src/com/android/camera/FocusOverlayManager.java | |
| parent | dde4c053296dc44f46478e03c4c787000615a241 (diff) | |
| download | android_packages_apps_Snap-0fb5ded484a10cd8ff4f7051e0f1bab20f1dcd15.tar.gz android_packages_apps_Snap-0fb5ded484a10cd8ff4f7051e0f1bab20f1dcd15.tar.bz2 android_packages_apps_Snap-0fb5ded484a10cd8ff4f7051e0f1bab20f1dcd15.zip | |
camera: Keep touch focus intact during back-to-back ZSL shots
* If ZSL is enabled, we should not resetTouchFocus between shots.
* Instead, re-kick the timer for each shot. If I set a focus point,
I want that point to stick while I take a succession of shots.
Change-Id: I407bb1e248cc902355d0294f47b071cc8a32fac3
Diffstat (limited to 'src/com/android/camera/FocusOverlayManager.java')
| -rw-r--r-- | src/com/android/camera/FocusOverlayManager.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java index 8f0f55908..c1b95a3ed 100644 --- a/src/com/android/camera/FocusOverlayManager.java +++ b/src/com/android/camera/FocusOverlayManager.java @@ -502,6 +502,15 @@ public class FocusOverlayManager { return mMeteringArea; } + public void restartTouchFocusTimer() { + if (mZslEnabled && (mFocusArea != null) && (mFocusTime != 0x7FFFFFFF)) { + mHandler.removeMessages(RESET_TOUCH_FOCUS); + mHandler.sendEmptyMessageDelayed(RESET_TOUCH_FOCUS, mFocusTime); + } else { + resetTouchFocus(); + } + } + public void resetTouchFocus() { if (!mInitialized) return; @@ -568,7 +577,8 @@ public class FocusOverlayManager { } private boolean needAutoFocusCall() { - return getFocusMode(false).equals(Parameters.FOCUS_MODE_AUTO); + return getFocusMode(false).equals(Parameters.FOCUS_MODE_AUTO) && + !(mZslEnabled && (mHandler.hasMessages(RESET_TOUCH_FOCUS))); } public void setZslEnable(boolean value) { |