diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-03-23 14:17:49 -0700 |
|---|---|---|
| committer | Jack Yoo <jyoo@codeaurora.org> | 2016-06-01 11:15:26 -0700 |
| commit | 77f78793bd93f0003c7e310592414f1fc93236e5 (patch) | |
| tree | 64a8f85615e19bbd06ebb07d0e9330ae6c1ce6e0 /src/com/android/camera/SettingsManager.java | |
| parent | 582f442b22a10f64ed99ac1efb151d444350c9f2 (diff) | |
| download | android_packages_apps_Snap-77f78793bd93f0003c7e310592414f1fc93236e5.tar.gz android_packages_apps_Snap-77f78793bd93f0003c7e310592414f1fc93236e5.tar.bz2 android_packages_apps_Snap-77f78793bd93f0003c7e310592414f1fc93236e5.zip | |
SnapdragonCamera: PostProcessor and Optizoom
Introducing PostProcessor with Optizoom filter
Change-Id: Ib9ac6d4a9526be3a5163d02e298ed783daad48c1
CRs-Fixed: 1023183
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
| -rw-r--r-- | src/com/android/camera/SettingsManager.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index a01d2543b..d19cab2a6 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -41,6 +41,7 @@ import android.util.Range; import android.util.Rational; import android.util.Size; +import com.android.camera.imageprocessor.filter.OptizoomFilter; import com.android.camera.ui.ListMenu; import org.codeaurora.snapcam.R; @@ -59,6 +60,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final int RESOURCE_TYPE_LARGEICON = 1; // Custom-Scenemodes start from 100 public static final int SCENE_MODE_DUAL_INT = 100; + public static final int SCENE_MODE_OPTIZOOM_INT = 101; public static final String SCENE_MODE_DUAL_STRING = "100"; public static final String KEY_CAMERA_SAVEPATH = "pref_camera2_savepath_key"; public static final String KEY_RECORD_LOCATION = "pref_camera2_recordlocation_key"; @@ -108,7 +110,11 @@ public class SettingsManager implements ListMenu.SettingsListener { String cameraId = cameraIdList[i]; CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraId); - Byte monoOnly = characteristics.get(CaptureModule.MetaDataMonoOnlyKey); + Byte monoOnly = 0; + try { + monoOnly = characteristics.get(CaptureModule.MetaDataMonoOnlyKey); + }catch(Exception e) { + } if (monoOnly == 1) { CaptureModule.MONO_ID = i; mIsMonoCameraPresent = true; @@ -680,6 +686,7 @@ public class SettingsManager implements ListMenu.SettingsListener { List<String> modes = new ArrayList<>(); modes.add("0"); // need special case handle for auto scene mode if (mIsMonoCameraPresent) modes.add(SCENE_MODE_DUAL_STRING); // need special case handle for dual mode + if (OptizoomFilter.isSupportedStatic()) modes.add(SCENE_MODE_OPTIZOOM_INT + ""); // need special case handle for dual mode for (int mode : sceneModes) { modes.add("" + mode); } |