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
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:39 +0200
commit91d77362feead0419c887a723a3a82452af2891b (patch)
treedb960f5675829a1b3035c75fae40d04eedd67093 /src/com/android/camera/CameraSettings.java
parent73f2937a9198d233e3c2f248a0886394e9dcf27e (diff)
downloadandroid_packages_apps_Snap-91d77362feead0419c887a723a3a82452af2891b.tar.gz
android_packages_apps_Snap-91d77362feead0419c887a723a3a82452af2891b.tar.bz2
android_packages_apps_Snap-91d77362feead0419c887a723a3a82452af2891b.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 9b01ad306..7b9f45c4a 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -641,6 +641,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);
@@ -766,6 +767,11 @@ public class CameraSettings {
colorEffect, mParameters.getSupportedColorEffects());
}
+ if (camcorderColorEffect != null) {
+ filterUnsupportedOptions(group,
+ camcorderColorEffect, mParameters.getSupportedColorEffects());
+ }
+
if (aeBracketing != null) {
filterUnsupportedOptions(group,
aeBracketing, getSupportedAEBracketingModes(mParameters));