summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2014-08-26 06:11:21 +0300
committerMichael Bestas <mikeioannina@gmail.com>2015-09-20 20:02:05 +0300
commit58d454bd4ef24aa8e71bcb6ab3b4349902561256 (patch)
tree133f4f3fc3c99f750f6b482d93c9c17e295b7516
parent8062e0b048dfe8604b7e4f2ba30c0f0aaaf24a0b (diff)
downloadandroid_packages_apps_Snap-58d454bd4ef24aa8e71bcb6ab3b4349902561256.zip
android_packages_apps_Snap-58d454bd4ef24aa8e71bcb6ab3b4349902561256.tar.gz
android_packages_apps_Snap-58d454bd4ef24aa8e71bcb6ab3b4349902561256.tar.bz2
Snap: Fix filtering of unsupported camcorder color effects
Change-Id: I365deeb17995175db873f6799cf0cde43ee61e96
-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 b27041c..465c690 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -532,6 +532,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);
@@ -650,6 +651,11 @@ public class CameraSettings {
colorEffect, mParameters.getSupportedColorEffects());
}
+ if (camcorderColorEffect != null) {
+ filterUnsupportedOptions(group,
+ camcorderColorEffect, mParameters.getSupportedColorEffects());
+ }
+
if (aeBracketing != null) {
filterUnsupportedOptions(group,
aeBracketing, getSupportedAEBracketingModes(mParameters));