From f246a23440838f76136a5b49b3eefd82afa24a7e Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 11 Jun 2018 16:58:39 +0200 Subject: [PATCH] remove the standalone cancel autofocus function --- .../simplemobiletools/camera/views/PreviewCameraTwo.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt index 3da652c1..0f322ac1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt @@ -597,9 +597,11 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie } } - cancelAutoFocus() mCaptureSession!!.stopRepeating() mPreviewRequestBuilder!!.apply { + set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE) + mCaptureSession!!.capture(build(), mCaptureCallback, mBackgroundHandler) + // touch-to-focus inspired by OpenCamera val characteristics = getCameraCharacteristics() if (characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF) >= 1) { @@ -618,12 +620,6 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie } } - private fun cancelAutoFocus() { - val cancelRequest = mPreviewRequestBuilder - cancelRequest!!.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE) - mCaptureSession!!.capture(cancelRequest.build(), null, mBackgroundHandler) - } - private fun convertAreaToMeteringRectangle(sensorRect: Rect, focusArea: FocusArea): MeteringRectangle { val camera2Rect = convertRectToCamera2(sensorRect, focusArea.rect) return MeteringRectangle(camera2Rect, focusArea.weight)