diff options
| author | Likai Ding <likaid@codeaurora.org> | 2015-05-27 15:59:04 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2015-05-27 15:59:04 +0800 |
| commit | 36cfd9c72b8ed4ddce7625cc01641f2235bb473c (patch) | |
| tree | c9a702ba7b993116b1fd5329a9ee533a10a5aad5 /src/com/android/camera/CameraSettings.java | |
| parent | da42b04ba6c0c3ec0b3f7e71ca5a277274443f89 (diff) | |
| download | android_packages_apps_Snap-36cfd9c72b8ed4ddce7625cc01641f2235bb473c.tar.gz android_packages_apps_Snap-36cfd9c72b8ed4ddce7625cc01641f2235bb473c.tar.bz2 android_packages_apps_Snap-36cfd9c72b8ed4ddce7625cc01641f2235bb473c.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 b5c264b96..7aa96d52d 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -740,6 +740,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); @@ -789,6 +790,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 = @@ -800,6 +812,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) { |