fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-02-28 00:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure flashlight changes are ignored if the device has no flashlight

Browse Source
This commit is contained in:
tibbi 2018-05-30 11:10:56 +02:00
parent d676ef9605
commit c69e34a9b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
View File

@ -453,7 +453,6 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
showToggleCameraIfNeeded() showToggleCameraIfNeeded()
if (mPreview?.resumeCamera() == true) { if (mPreview?.resumeCamera() == true) {
hideNavigationBarIcons() hideNavigationBarIcons()
mPreview?.checkFlashlight()
if (!mIsInPhotoMode) { if (!mIsInPhotoMode) {
initVideoButtons() initVideoButtons()

3
app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt
View File

@ -444,6 +444,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
} }
override fun toggleFrontBackCamera() { override fun toggleFrontBackCamera() {
mUseFrontCamera = !mUseFrontCamera
} }
override fun toggleFlashlight() { override fun toggleFlashlight() {
@ -472,7 +473,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
} }
override fun checkFlashlight() { override fun checkFlashlight() {
if (mCameraState == STATE_PREVIEW) { if (mCameraState == STATE_PREVIEW && mIsFlashSupported) {
mPreviewRequestBuilder!!.set(CaptureRequest.FLASH_MODE, getFlashlightMode(mFlashlightState)) mPreviewRequestBuilder!!.set(CaptureRequest.FLASH_MODE, getFlashlightMode(mFlashlightState))
mCaptureSession!!.setRepeatingRequest(mPreviewRequestBuilder!!.build(), mCaptureCallback, mBackgroundHandler) mCaptureSession!!.setRepeatingRequest(mPreviewRequestBuilder!!.build(), mCaptureCallback, mBackgroundHandler)
mActivity.updateFlashlightState(mFlashlightState) mActivity.updateFlashlightState(mFlashlightState)