From 88855fdf39d75a89cc0ef947fb67ce09c0fb33b4 Mon Sep 17 00:00:00 2001 From: junjiez Date: Thu, 21 Jul 2016 13:16:47 +0800 Subject: SnapdragonCamera: Disable chroma flash when HDR is enabled Camera HAL doesn't support to take picture with both HDR and chroma flash, so disable chroma flash when HDR is enabled to avoid crash Change-Id: I57a68d9b7371a75faceacf0fe1c3958dc21dae8b CRs-Fixed: 1013368 --- src/com/android/camera/PhotoMenu.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) mode change 100644 => 100755 src/com/android/camera/PhotoMenu.java (limited to 'src/com/android/camera/PhotoMenu.java') diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java old mode 100644 new mode 100755 index 6a1f08597..8a195411e --- 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)); -- cgit v1.2.3