diff options
| author | Camera Software Integration <camswint@localhost> | 2016-08-02 10:54:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-02 10:54:25 -0700 |
| commit | 6c022f8695f25ab17ed06bb2d276242ed4a5be53 (patch) | |
| tree | 897c07d3044e867569b5a9d5621c8bf87713d1ea /src/com/android/camera/PhotoMenu.java | |
| parent | 5fb2b48eaf392b128897b4b18b706bc285a9ee78 (diff) | |
| parent | 88855fdf39d75a89cc0ef947fb67ce09c0fb33b4 (diff) | |
| download | android_packages_apps_Snap-6c022f8695f25ab17ed06bb2d276242ed4a5be53.tar.gz android_packages_apps_Snap-6c022f8695f25ab17ed06bb2d276242ed4a5be53.tar.bz2 android_packages_apps_Snap-6c022f8695f25ab17ed06bb2d276242ed4a5be53.zip | |
Merge "SnapdragonCamera: Disable chroma flash when HDR is enabled" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/PhotoMenu.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 8988e8e2a..affffa034 100644..100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -693,6 +693,7 @@ public class PhotoMenu extends MenuController popup1.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE, false); popup1.setPreferenceEnabled(CameraSettings.KEY_WHITE_BALANCE, false); popup1.setPreferenceEnabled(CameraSettings.KEY_EXPOSURE, false); + popup1.setPreferenceEnabled(CameraSettings.KEY_QC_CHROMA_FLASH, false); } if ((autohdr != null) && autohdr.equals("enable")) { popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE, false); @@ -1457,6 +1458,18 @@ public class PhotoMenu extends MenuController } } + String chromaFlashOn = mActivity.getString(R.string. + pref_camera_advanced_feature_value_chromaflash_on); + if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) { + ListPreference lp = mPreferenceGroup + .findPreference(CameraSettings.KEY_ADVANCED_FEATURES); + if (lp != null && chromaFlashOn.equals(lp.getValue())) { + setPreference(CameraSettings.KEY_QC_CHROMA_FLASH, mSettingOff); + setPreference(CameraSettings.KEY_ADVANCED_FEATURES, + mActivity.getString(R.string.pref_camera_advanced_feature_default)); + } + } + if (notSame(pref, CameraSettings.KEY_SCENE_MODE, "auto")) { setPreference(CameraSettings.KEY_COLOR_EFFECT, mActivity.getString(R.string.pref_camera_coloreffect_default)); |