summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2016-01-06 11:35:40 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:02:22 +0100
commita5340ca1cf6f85a3df76c07501ce9df2564b853c (patch)
tree517495f699d865aada08bb83c8a7b216933f460c /src/com/android/camera/CameraSettings.java
parent7c7c54f29c284735dabced81ab58266e389d49fb (diff)
downloadandroid_packages_apps_Snap-a5340ca1cf6f85a3df76c07501ce9df2564b853c.tar.gz
android_packages_apps_Snap-a5340ca1cf6f85a3df76c07501ce9df2564b853c.tar.bz2
android_packages_apps_Snap-a5340ca1cf6f85a3df76c07501ce9df2564b853c.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.java20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index c84eb3774..a13205a7a 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -103,6 +103,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";
@@ -159,6 +160,8 @@ public class CameraSettings {
private static final String KEY_QC_SUPPORTED_VIDEO_TNR_MODES = "video-tnr-mode-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";
@@ -433,6 +436,7 @@ public class CameraSettings {
return group;
}
+ // ISO
public static List<String> getSupportedIsoValues(Parameters params) {
String isoValues = params.get(mKeyIsoValues);
if (isoValues == null) {
@@ -455,6 +459,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
@@ -772,6 +786,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);
@@ -892,6 +907,11 @@ public class CameraSettings {
mIso, getSupportedIsoValues(mParameters));
}
+ if (mShutterSpeed != null) {
+ filterUnsupportedOptions(group,
+ mShutterSpeed, getSupportedShutterSpeedValues(mParameters));
+ }
+
if (redeyeReduction != null) {
filterUnsupportedOptions(group,
redeyeReduction, ParametersWrapper.getSupportedRedeyeReductionModes(mParameters));