make toggle_camera nullable at MainActivity

This commit is contained in:
tibbi
2018-03-31 23:29:34 +02:00
parent dccc85e0a1
commit 43ff590e64
3 changed files with 16 additions and 16 deletions

View File

@ -380,8 +380,9 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
return
}
if (takePictureAfter)
if (takePictureAfter) {
mIsFocusingBeforeCapture = true
}
mCamera!!.cancelAutoFocus()
if (mParameters!!.maxNumFocusAreas > 0) {
@ -395,8 +396,9 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
focusAreas.add(Camera.Area(focusRect, 1000))
mParameters!!.focusAreas = focusAreas
if (showFocusRect)
if (showFocusRect) {
mCallback.drawFocusRect(mLastClickX, mLastClickY)
}
}
try {