diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-01 11:14:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-01 11:14:22 -0700 |
| commit | 2d1d3b11fb19dbddcd735d5c1707936cab176ae5 (patch) | |
| tree | 68a51d05554869effec99d28542c0396b59caa80 /src/com/android/camera/CaptureModule.java | |
| parent | 7a6688bf961da8d409b579db2bcb67fbbd963b90 (diff) | |
| parent | ddcb6092b17c1756a435f65bf53d0339a44cf645 (diff) | |
| download | android_packages_apps_Snap-2d1d3b11fb19dbddcd735d5c1707936cab176ae5.tar.gz android_packages_apps_Snap-2d1d3b11fb19dbddcd735d5c1707936cab176ae5.tar.bz2 android_packages_apps_Snap-2d1d3b11fb19dbddcd735d5c1707936cab176ae5.zip | |
Merge "SnapdragonCamera: Add setprop to control cancel touch AF delay" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/CaptureModule.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 238b964ca..d156b68bf 100644..100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -147,7 +147,7 @@ public class CaptureModule implements CameraModule, PhotoController, public static final int INTENT_MODE_CAPTURE_SECURE = 3; private static final int BACK_MODE = 0; private static final int FRONT_MODE = 1; - private static final int CANCEL_TOUCH_FOCUS_DELAY = 5000; + private static final int CANCEL_TOUCH_FOCUS_DELAY = PersistUtil.getCancelTouchFocusDelay(); private static final int OPEN_CAMERA = 0; private static final int CANCEL_TOUCH_FOCUS = 1; private static final int MAX_NUM_CAM = 3; @@ -753,6 +753,9 @@ public class CaptureModule implements CameraModule, PhotoController, break; } case STATE_WAITING_TOUCH_FOCUS: + Integer afState = result.get(CaptureResult.CONTROL_AF_STATE); + Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE); + Log.d(TAG, "STATE_WAITING_TOUCH_FOCUS id: " + id + " afState:" + afState + " aeState:" + aeState); break; } } |