diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-06 11:35:40 +0100 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2016-01-06 03:22:48 -0800 |
| commit | c75c27de40ef97d9d2168c2a70916de876cd26da (patch) | |
| tree | 09a00611638df7c71ec7ee759b4ce909e02bee85 /src/com/android/camera/CameraSettings.java | |
| parent | b729dc33d1f437b84512a09c133f894ac417eef6 (diff) | |
| download | android_packages_apps_Snap-c75c27de40ef97d9d2168c2a70916de876cd26da.tar.gz android_packages_apps_Snap-c75c27de40ef97d9d2168c2a70916de876cd26da.tar.bz2 android_packages_apps_Snap-c75c27de40ef97d9d2168c2a70916de876cd26da.zip | |
Snap: add support for shutter speed
Change-Id: Id3393280c7c1c2f292d71587ba099e8dbafd1340
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index e65e914e0..92c8b5038 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -98,6 +98,7 @@ public class CameraSettings { public static final String KEY_AUTOEXPOSURE = "pref_camera_autoexposure_key"; public static final String KEY_ANTIBANDING = "pref_camera_antibanding_key"; public static final String KEY_ISO = "pref_camera_iso_key"; + public static final String KEY_SHUTTER_SPEED = "pref_camera_shutter_speed_key"; public static final String KEY_LENSSHADING = "pref_camera_lensshading_key"; public static final String KEY_HISTOGRAM = "pref_camera_histogram_key"; public static final String KEY_DENOISE = "pref_camera_denoise_key"; @@ -144,6 +145,8 @@ public class CameraSettings { private static final String KEY_QC_SUPPORTED_PREVIEW_FORMATS = "preview-format-values"; private static final String KEY_SNAPCAM_SUPPORTED_HDR_MODES = "hdr-mode-values"; private static final String KEY_SNAPCAM_SUPPORTED_HDR_NEED_1X = "hdr-need-1x-values"; + public static final String KEY_SNAPCAM_SHUTTER_SPEED = "shutter-speed"; + public static final String KEY_SNAPCAM_SHUTTER_SPEED_MODES = "shutter-speed-values"; public static final String KEY_QC_AE_BRACKETING = "ae-bracket-hdr"; public static final String KEY_QC_AF_BRACKETING = "af-bracket"; public static final String KEY_QC_RE_FOCUS = "re-focus"; @@ -294,6 +297,7 @@ public class CameraSettings { return group; } + // ISO public static List<String> getSupportedIsoValues(Parameters params) { String isoValues = params.get(mKeyIsoValues); if (isoValues == null) { @@ -316,6 +320,16 @@ public class CameraSettings { params.set(mKeyIso, iso); } + // Shutter speed + public static List<String> getSupportedShutterSpeedValues(Parameters params) { + String shutterSpeedValues = params.get(KEY_SNAPCAM_SHUTTER_SPEED_MODES); + if (shutterSpeedValues == null) { + return null; + } + Log.d(TAG, "Supported shutter speed values: " + shutterSpeedValues); + return split(shutterSpeedValues); + } + public static String getSupportedHighestVideoQuality( int cameraId, Parameters parameters) { // When launching the camera app first time, we will set the video quality @@ -604,6 +618,7 @@ public class CameraSettings { ListPreference autoExposure = group.findPreference(KEY_AUTOEXPOSURE); ListPreference antiBanding = group.findPreference(KEY_ANTIBANDING); ListPreference mIso = group.findPreference(KEY_ISO); + ListPreference mShutterSpeed = group.findPreference(KEY_SHUTTER_SPEED); ListPreference lensShade = group.findPreference(KEY_LENSSHADING); ListPreference histogram = group.findPreference(KEY_HISTOGRAM); ListPreference denoise = group.findPreference(KEY_DENOISE); @@ -699,6 +714,11 @@ public class CameraSettings { mIso, getSupportedIsoValues(mParameters)); } + if (mShutterSpeed != null) { + filterUnsupportedOptions(group, + mShutterSpeed, getSupportedShutterSpeedValues(mParameters)); + } + if (redeyeReduction != null) { filterUnsupportedOptions(group, redeyeReduction, mParameters.getSupportedRedeyeReductionModes()); |