v1.0.0-beta3.2

CameraKit · Aug 17, 2018 · c330342 · c330342
1 parent c91c144
commit c330342
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
 subprojects { project ->
     group = 'com.camerakit'
-    version = '1.0.0-beta3.1'
+    version = '1.0.0-beta3.2'
 
     repositories {
         google()

diff --git a/camerakit/src/main/java/com/camerakit/CameraPreview.kt b/camerakit/src/main/java/com/camerakit/CameraPreview.kt
@@ -26,7 +26,7 @@ import kotlin.math.absoluteValue
 class CameraPreview : FrameLayout, CameraEvents {
 
     companion object {
-        private const val FORCE_DEPRECATED_API = true
+        private const val FORCE_DEPRECATED_API = false
     }
 
     var listener: Listener? = null

diff --git a/camerakit/src/main/java/com/camerakit/api/camera2/Camera2.kt b/camerakit/src/main/java/com/camerakit/api/camera2/Camera2.kt
@@ -128,15 +128,13 @@ class Camera2(eventsDelegate: CameraEvents, context: Context) :
     }
 
     private fun setFlashRequest(captureRequest: CaptureRequest.Builder) {
+        captureRequest.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_OFF)
         if (flash == CameraFlash.OFF) {
             captureRequest.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_AE_MODE_ON)
-            captureRequest.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_OFF)
         } else if (flash == CameraFlash.ON) {
             captureRequest.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_AE_MODE_ON_ALWAYS_FLASH)
-            captureRequest.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_SINGLE)
         } else if (flash == CameraFlash.AUTO) {
             captureRequest.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH)
-            captureRequest.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_OFF)
         }
     }
 
@@ -182,6 +180,9 @@ class Camera2(eventsDelegate: CameraEvents, context: Context) :
 
             captureBuilder.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE)
             setFlashRequest(captureBuilder)
+            if (flash == CameraFlash.ON) {
+                captureBuilder.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_SINGLE)
+            }
 
             captureSession.stopRepeating()
             captureSession.abortCaptures()