diff options
| author | Likai Ding <likaid@codeaurora.org> | 2015-05-27 15:59:04 +0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-03 15:45:47 -0700 |
| commit | 846dc6ad1013a28d60aa883ce3d219bf01167e86 (patch) | |
| tree | e1a01f23107f337236678e0bff8ebe3f043193e4 /src/com/android/camera/CameraSettings.java | |
| parent | 9a1d5c26b78d3e7edb8a02961289f934a862cceb (diff) | |
| download | android_packages_apps_Snap-846dc6ad1013a28d60aa883ce3d219bf01167e86.tar.gz android_packages_apps_Snap-846dc6ad1013a28d60aa883ce3d219bf01167e86.tar.bz2 android_packages_apps_Snap-846dc6ad1013a28d60aa883ce3d219bf01167e86.zip | |
SnapdragonCamera: implement optizoom and chromaflash UI
add scene mode for optizoom and preference entry for chromaflash
Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index ee5ba7b85..66a022b2d 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -881,6 +881,7 @@ public class CameraSettings { ListPreference timeLapseInterval = group.findPreference(KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL); ListPreference pictureSize = group.findPreference(KEY_PICTURE_SIZE); ListPreference whiteBalance = group.findPreference(KEY_WHITE_BALANCE); + ListPreference chromaFlash = group.findPreference(KEY_QC_CHROMA_FLASH); ListPreference sceneMode = group.findPreference(KEY_SCENE_MODE); ListPreference flashMode = group.findPreference(KEY_FLASH_MODE); ListPreference focusMode = group.findPreference(KEY_FOCUS_MODE); @@ -927,6 +928,17 @@ public class CameraSettings { whiteBalance, mParameters.getSupportedWhiteBalance()); } + if (chromaFlash != null) { + List<String> supportedAdvancedFeatures = + getSupportedAdvancedFeatures(mParameters); + if (!CameraUtil.isSupported( + mContext.getString(R.string + .pref_camera_advanced_feature_value_chromaflash_on), + supportedAdvancedFeatures)) { + removePreference(group, chromaFlash.getKey()); + } + } + if (sceneMode != null) { List<String> supportedSceneModes = mParameters.getSupportedSceneModes(); List<String> supportedAdvancedFeatures = @@ -938,6 +950,13 @@ public class CameraSettings { supportedSceneModes.add(mContext.getString(R.string .pref_camera_advanced_feature_value_refocus_on)); } + if (CameraUtil.isSupported( + mContext.getString(R.string + .pref_camera_advanced_feature_value_optizoom_on), + supportedAdvancedFeatures)) { + supportedSceneModes.add(mContext.getString(R.string + .pref_camera_advanced_feature_value_optizoom_on)); + } filterUnsupportedOptions(group, sceneMode, supportedSceneModes); } if (flashMode != null) { |