diff options
| author | Camera Software Integration <camswint@localhost> | 2016-12-13 02:32:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-13 02:32:33 -0800 |
| commit | a48b5bc37fc2aea2300f53b4a77c07b4b426d1d8 (patch) | |
| tree | ecd7c1b5d04be0f3cef5a357481fe3b45cc51704 /src/com/android/camera/SettingsManager.java | |
| parent | 1e8e52e5de1725d47101157b2328cbd76e9d9a83 (diff) | |
| parent | b39e01c54b0d46b8a005e48e88537bc875b4977b (diff) | |
| download | android_packages_apps_Snap-a48b5bc37fc2aea2300f53b4a77c07b4b426d1d8.tar.gz android_packages_apps_Snap-a48b5bc37fc2aea2300f53b4a77c07b4b426d1d8.tar.bz2 android_packages_apps_Snap-a48b5bc37fc2aea2300f53b4a77c07b4b426d1d8.zip | |
Merge "SnapdragonCamera: Show label and dialog when switch to new scene mode" into camera.lnx.1.0-dev.1.0
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) { |