summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2014-08-26 06:11:21 +0300
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:00:52 +0100
commit13bc1859c81e62a3d3571191261fd0332d945560 (patch)
treeb5fb54d230be5c50811693d017c84ece9ef02c85 /src/com/android/camera/CameraSettings.java
parent3fb36c88ffd3167fb131b792e4c2d12667410956 (diff)
downloadandroid_packages_apps_Snap-13bc1859c81e62a3d3571191261fd0332d945560.tar.gz
android_packages_apps_Snap-13bc1859c81e62a3d3571191261fd0332d945560.tar.bz2
android_packages_apps_Snap-13bc1859c81e62a3d3571191261fd0332d945560.zip
Snap: Fix filtering of unsupported camcorder color effects
Change-Id: I365deeb17995175db873f6799cf0cde43ee61e96
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 6a6db825a..a278d788b 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -699,6 +699,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);
@@ -842,6 +843,11 @@ public class CameraSettings {
colorEffect, mParameters.getSupportedColorEffects());
}
+ if (camcorderColorEffect != null) {
+ filterUnsupportedOptions(group,
+ camcorderColorEffect, mParameters.getSupportedColorEffects());
+ }
+
if (aeBracketing != null) {
filterUnsupportedOptions(group,
aeBracketing, getSupportedAEBracketingModes(mParameters));