diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-02-10 17:22:09 -0800 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 15:54:51 -0700 |
| commit | 7dd609bbc372c2bbeb9e3c10fe567e085da4f15d (patch) | |
| tree | c947d9f35a0bfded03cea094ab81f222afde7258 /src/com/android/camera/CaptureModule.java | |
| parent | 13f5f043eca7b0b6487f2809a06a010c268648b6 (diff) | |
SnapdragonCamera: Panorama Module
Introducing Panorama capture module for Camera2
Change-Id: I98306c6c88c34c58b99adf9d472418392015f6c5
CRs-Fixed: 1067848
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 64d111678..69cdecfc5 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1880,10 +1880,10 @@ public class CaptureModule implements CameraModule, PhotoController, mSound = new MediaActionSound(); } + String scene = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); if(mPostProcessor != null) { String longshot = mSettingsManager.getValue(SettingsManager.KEY_LONGSHOT); String flashMode = mSettingsManager.getValue(SettingsManager.KEY_FLASH_MODE); - String scene = mSettingsManager.getValue(SettingsManager.KEY_SCENE_MODE); if (scene != null) { int mode = Integer.parseInt(scene); Log.d(TAG, "Chosen postproc filter id : " + getPostProcFilterId(mode)); @@ -1937,6 +1937,11 @@ public class CaptureModule implements CameraModule, PhotoController, } }); mUI.enableShutter(true); + + if(isPanoSetting(scene)) { + mActivity.onModuleSelected(ModuleSwitcher.PANOCAPTURE_MODULE_INDEX); + mSettingsManager.setValue(SettingsManager.KEY_SCENE_MODE, SettingsManager.SCENE_MODE_AUTO_INT+""); + } } @Override @@ -3389,6 +3394,17 @@ public class CaptureModule implements CameraModule, PhotoController, } } + private boolean isPanoSetting(String value) { + try { + int mode = Integer.parseInt(value); + if(mode == SettingsManager.SCENE_MODE_PANORAMA_INT) { + return true; + } + } catch(Exception e) { + } + return false; + } + private void updateFaceDetection() { final String value = mSettingsManager.getValue(SettingsManager.KEY_FACE_DETECTION); mActivity.runOnUiThread(new Runnable() { |
