summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rwxr-xr-xsrc/com/android/camera/CameraSettings.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 9894480de..9dce35b6a 100755
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -89,6 +89,7 @@ public class CameraSettings {
public static final String KEY_CAMERA_SAVEPATH = "pref_camera_savepath_key";
public static final String KEY_FILTER_MODE = "pref_camera_filter_mode_key";
public static final String KEY_COLOR_EFFECT = "pref_camera_coloreffect_key";
+ public static final String KEY_VIDEOCAMERA_COLOR_EFFECT = "pref_camera_video_coloreffect_key";
public static final String KEY_FACE_DETECTION = "pref_camera_facedetection_key";
public static final String KEY_TOUCH_AF_AEC = "pref_camera_touchafaec_key";
public static final String KEY_SELECTABLE_ZONE_AF = "pref_camera_selectablezoneaf_key";
@@ -752,6 +753,7 @@ public class CameraSettings {
ListPreference powerMode = group.findPreference(KEY_POWER_MODE);
ListPreference zsl = group.findPreference(KEY_ZSL);
ListPreference colorEffect = group.findPreference(KEY_COLOR_EFFECT);
+ ListPreference camcorderColorEffect = group.findPreference(KEY_VIDEOCAMERA_COLOR_EFFECT);
ListPreference faceDetection = group.findPreference(KEY_FACE_DETECTION);
ListPreference touchAfAec = group.findPreference(KEY_TOUCH_AF_AEC);
ListPreference selectableZoneAf = group.findPreference(KEY_SELECTABLE_ZONE_AF);
@@ -895,6 +897,11 @@ public class CameraSettings {
colorEffect, mParameters.getSupportedColorEffects());
}
+ if (camcorderColorEffect != null) {
+ filterUnsupportedOptions(group,
+ camcorderColorEffect, mParameters.getSupportedColorEffects());
+ }
+
if (aeBracketing != null) {
filterUnsupportedOptions(group,
aeBracketing, getSupportedAEBracketingModes(mParameters));