diff options
Diffstat (limited to 'src/com/android/camera/SettingsManager.java')
-rw-r--r-- | src/com/android/camera/SettingsManager.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index 520a247f6..c1c6442dd 100644 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -112,6 +112,7 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final String KEY_FILTER_MODE = "pref_camera2_filter_mode_key"; public static final String KEY_COLOR_EFFECT = "pref_camera2_coloreffect_key"; public static final String KEY_SCENE_MODE = "pref_camera2_scenemode_key"; + public static final String KEY_SCEND_MODE_INSTRUCTIONAL = "pref_camera2_scenemode_instructional"; public static final String KEY_REDEYE_REDUCTION = "pref_camera2_redeyereduction_key"; public static final String KEY_CAMERA_ID = "pref_camera2_id_key"; public static final String KEY_PICTURE_SIZE = "pref_camera2_picturesize_key"; @@ -540,6 +541,9 @@ public class SettingsManager implements ListMenu.SettingsListener { ListPreference flashMode = mPreferenceGroup.findPreference(KEY_FLASH_MODE); ListPreference colorEffect = mPreferenceGroup.findPreference(KEY_COLOR_EFFECT); ListPreference sceneMode = mPreferenceGroup.findPreference(KEY_SCENE_MODE); + ListPreference sceneModeInstructional = + mPreferenceGroup.findPreference(KEY_SCEND_MODE_INSTRUCTIONAL); + ListPreference cameraIdPref = mPreferenceGroup.findPreference(KEY_CAMERA_ID); ListPreference pictureSize = mPreferenceGroup.findPreference(KEY_PICTURE_SIZE); ListPreference exposure = mPreferenceGroup.findPreference(KEY_EXPOSURE); @@ -579,6 +583,13 @@ public class SettingsManager implements ListMenu.SettingsListener { } } + if ( sceneModeInstructional != null ) { + if (filterUnsupportedOptions(sceneModeInstructional, + getSupportedSceneModes(cameraId)) ){ + mFilteredKeys.add(sceneModeInstructional.getKey()); + } + } + if (cameraIdPref != null) buildCameraId(); if (pictureSize != null) { |