diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-04-12 11:42:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-29 17:08:18 -0700 |
| commit | 5d40b84f26f5a9ce021f0b690d273cdaeb1803a1 (patch) | |
| tree | ef0f2b89efb10281c28a2227c71fd0aca9e7410e /src/com/android/camera/FocusStateListener.java | |
| parent | ae3088c753f96a2f5c6c9bcdeaeda78114d85024 (diff) | |
| download | android_packages_apps_Snap-5d40b84f26f5a9ce021f0b690d273cdaeb1803a1.tar.gz android_packages_apps_Snap-5d40b84f26f5a9ce021f0b690d273cdaeb1803a1.tar.bz2 android_packages_apps_Snap-5d40b84f26f5a9ce021f0b690d273cdaeb1803a1.zip | |
SnapdragonCamera: Fix AF mode for touch-to-focus and taking snapshot
Use the current AF mode for snapshot. For touch-to-focus, use AUTO mode
and reset to CAF after a delay.
CRs-Fixed: 989750
Change-Id: I6318b05d57273c0a2fff5b3366faa471f6faaf85
Diffstat (limited to 'src/com/android/camera/FocusStateListener.java')
| -rw-r--r-- | src/com/android/camera/FocusStateListener.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/camera/FocusStateListener.java b/src/com/android/camera/FocusStateListener.java index 42edd5c34..6c536c53b 100644 --- a/src/com/android/camera/FocusStateListener.java +++ b/src/com/android/camera/FocusStateListener.java @@ -30,8 +30,10 @@ package com.android.camera; import android.hardware.camera2.CaptureResult; +import android.util.Log; public class FocusStateListener { + private static final String TAG = "SnapCam_FocusStateListe"; private CaptureUI mUI; public FocusStateListener(CaptureUI ui) { @@ -41,24 +43,31 @@ public class FocusStateListener { public void onFocusStatusUpdate(int focusState) { switch (focusState) { case CaptureResult.CONTROL_AF_STATE_ACTIVE_SCAN: + Log.d(TAG, "CONTROL_AF_STATE_ACTIVE_SCAN onFocusStarted"); mUI.onFocusStarted(); break; case CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED: - mUI.onFocusSucceeded(true); + Log.d(TAG, "CONTROL_AF_STATE_FOCUSED_LOCKED onFocusSucceeded"); + mUI.onFocusSucceeded(false); break; case CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED: - mUI.onFocusFailed(true); + Log.d(TAG, "CONTROL_AF_STATE_NOT_FOCUSED_LOCKED onFocusFailed"); + mUI.onFocusFailed(false); break; case CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED: + Log.d(TAG, "CONTROL_AF_STATE_PASSIVE_FOCUSED onFocusSucceeded"); mUI.onFocusSucceeded(true); break; case CaptureResult.CONTROL_AF_STATE_PASSIVE_SCAN: + Log.d(TAG, "CONTROL_AF_STATE_PASSIVE_SCAN onFocusStarted"); mUI.onFocusStarted(); break; case CaptureResult.CONTROL_AF_STATE_PASSIVE_UNFOCUSED: + Log.d(TAG, "CONTROL_AF_STATE_PASSIVE_UNFOCUSED onFocusFailed"); mUI.onFocusFailed(true); break; case CaptureResult.CONTROL_AF_STATE_INACTIVE: + Log.d(TAG, "CONTROL_AF_STATE_INACTIVE clearFocus"); mUI.clearFocus(); break; } |