diff options
author | Steve Kondik <steve@cyngn.com> | 2016-08-03 15:40:15 -0700 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:08:25 +0100 |
commit | df787867c1390eb3edcfec9103659d980d97a61d (patch) | |
tree | 828bb70bf85d4167d4dded51526b1e9a2b3d0bac /src/com/android/camera/CameraSettings.java | |
parent | f07095322f00ebcffa4f6d9ca4368b743049059d (diff) | |
download | android_packages_apps_Snap-df787867c1390eb3edcfec9103659d980d97a61d.tar.gz android_packages_apps_Snap-df787867c1390eb3edcfec9103659d980d97a61d.tar.bz2 android_packages_apps_Snap-df787867c1390eb3edcfec9103659d980d97a61d.zip |
snap: Fixes for advanced features and scene modes
* Get rid of the annoying toast when longshot is disabled
* Add support for ChromaFlash as a scene mode
* Adjust overrides for various scene modes
Change-Id: Ifda1990f4e9b3435655664f2a6c2b31fc3ae23fa
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 195863260..ebab3fb8a 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1132,7 +1132,7 @@ public class CameraSettings { if (chromaFlash != null) { List<String> supportedAdvancedFeatures = getSupportedAdvancedFeatures(mParameters); - if (!CameraUtil.isSupported( + if (hasChromaFlashScene(mContext) || !CameraUtil.isSupported( mContext.getString(R.string .pref_camera_advanced_feature_value_chromaflash_on), supportedAdvancedFeatures)) { @@ -1160,6 +1160,13 @@ public class CameraSettings { supportedSceneModes.add(mContext.getString(R.string .pref_camera_advanced_feature_value_optizoom_on)); } + if (hasChromaFlashScene(mContext) && CameraUtil.isSupported( + mContext.getString(R.string + .pref_camera_advanced_feature_value_chromaflash_on), + supportedAdvancedFeatures)) { + supportedSceneModes.add(mContext.getString(R.string + .pref_camera_advanced_feature_value_chromaflash_on)); + } filterUnsupportedOptions(group, sceneMode, supportedSceneModes); } if (flashMode != null) { @@ -1819,4 +1826,16 @@ public class CameraSettings { pictureSize.setEntries(entries.toArray(new String[entries.size()])); pictureSize.setEntryValues(entryValues.toArray(new String[entryValues.size()])); } + + public static boolean hasChromaFlashScene(Context context) { + String[] sceneModes = context.getResources().getStringArray( + R.array.pref_camera_scenemode_entryvalues); + for (String mode : sceneModes) { + if (mode.equals(context.getResources().getString(R.string + .pref_camera_advanced_feature_value_chromaflash_on))) { + return true; + } + } + return false; + } } |