diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-10-12 09:50:47 -0700 |
|---|---|---|
| committer | Jack Yoo <jyoo@codeaurora.org> | 2016-10-20 11:24:37 -0700 |
| commit | e5638a1b4697191588438be133102f61b67a3985 (patch) | |
| tree | b127b3484af48db5d576d320b3807250fc190166 /src/com/android/camera/CaptureModule.java | |
| parent | c250484c375484e70a1c8e64eb8bd956b3f1c15d (diff) | |
SnapdragonCamera: PanoramaUI and filter change
1. Adjusting Panorama UI
2. Adjusting Chormaflash filter
3. Changing Ubifocus focus timeout value
4. ZSL Flash mode change
Change-Id: Ia46fdc827cd5529a8b7c6f5cfafc44bb3cf00d06
CRs-Fixed: 1080317
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index c800c6e4e..e81a34c6f 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -925,7 +925,7 @@ public class CaptureModule implements CameraModule, PhotoController, public void setFlashModeToPreview(int id, boolean isFlashOn) { Log.d(TAG, "setFlashModeToPreview " + isFlashOn); if(isFlashOn) { - mPreviewRequestBuilder[id].set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON); + mPreviewRequestBuilder[id].set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON_ALWAYS_FLASH); mPreviewRequestBuilder[id].set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_SINGLE); } else { mPreviewRequestBuilder[id].set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON); @@ -1507,6 +1507,7 @@ public class CaptureModule implements CameraModule, PhotoController, }); } mControlAFMode = CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE; + applyFlash(mPreviewRequestBuilder[id], id); applySettingsForUnlockExposure(mPreviewRequestBuilder[id], id); setAFModeToPreview(id, mControlAFMode); mTakingPicture[id] = false; @@ -3055,6 +3056,7 @@ public class CaptureModule implements CameraModule, PhotoController, mPreviewRequestBuilder[id].set(CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest .CONTROL_AF_TRIGGER_IDLE); applyCommonSettings(mPreviewRequestBuilder[id], id); + applyFlash(mPreviewRequestBuilder[id], id); } public float getZoomValue() { @@ -3106,10 +3108,6 @@ public class CaptureModule implements CameraModule, PhotoController, updatePreview = true; applyFaceDetection(mPreviewRequestBuilder[cameraId]); break; - case SettingsManager.KEY_FLASH_MODE: - updatePreview = true; - applyFlash(mPreviewRequestBuilder[cameraId], cameraId); - break; } return updatePreview; } |