diff options
| -rw-r--r-- | res/values/qcomstrings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 49 |
3 files changed, 34 insertions, 20 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index a5a51a13e..8f58433df 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -145,7 +145,7 @@ <string name="pref_camera_advanced_feature_entry_optizoom">Opti Zoom</string> <!-- Auto exposure entry values. Do not translate. --> - <string name="pref_camera_advanced_feature_value_none">af-bracket-off</string> + <string name="pref_camera_advanced_feature_value_none">none</string> <string name="pref_camera_advanced_feature_value_ubifocus_on">af-bracket-on</string> <string name="pref_camera_advanced_feature_value_chromaflash_on">chroma-flash-on</string> <string name="pref_camera_advanced_feature_value_optizoom_on">opti-zoom-on</string> diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 267de2d55..b49f2a066 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -258,10 +258,11 @@ public class CameraSettings { return split(str); } - public static List<String> getSupportedAdvancedFeatures(Parameters params) { + public List<String> getSupportedAdvancedFeatures(Parameters params) { String str = params.get(KEY_QC_SUPPORTED_AF_BRACKETING_MODES); str += ',' + params.get(KEY_QC_SUPPORTED_CF_MODES); str += ',' + params.get(KEY_QC_SUPPORTED_OZ_MODES); + str += ',' + mContext.getString(R.string.pref_camera_advanced_feature_default); return split(str); } diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 613cee8da..b8c133f2f 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -278,30 +278,43 @@ public class PhotoMenu extends PieController String optiZoomOn = mActivity.getString(R.string. pref_camera_advanced_feature_value_optizoom_on); - if ((advancedFeatures != null) && (advancedFeatures.equals(ubiFocusOn) || - advancedFeatures.equals(chromaFlashOn) || - advancedFeatures.equals(ubiFocusOn))) { - popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false); - popup3.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false); - popup3.setPreferenceEnabled(CameraSettings.KEY_AE_BRACKET_HDR,false); - popup3.setPreferenceEnabled(CameraSettings.KEY_REDEYE_REDUCTION,false); - popup3.setPreferenceEnabled(CameraSettings.KEY_EXPOSURE,false); - popup2.setPreferenceEnabled(CameraSettings.KEY_COLOR_EFFECT,false); - popup2.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC,false); - popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE,false); + if ((zsl != null) && Parameters.ZSL_OFF.equals(zsl)) { + popup3.overrideSettings(CameraSettings.KEY_ADVANCED_FEATURES, + mActivity.getString(R.string.pref_camera_advanced_feature_default)); + popup3.setPreferenceEnabled(CameraSettings.KEY_ADVANCED_FEATURES,false); if (mHdrItem != null) { - mHdrItem.setEnabled(false); + mHdrItem.setEnabled(true); } if (mHdrPlusItem != null) { - mHdrPlusItem.setEnabled(false); + mHdrPlusItem.setEnabled(true); } } else { - if (mHdrItem != null) { - mHdrItem.setEnabled(true); - } - if (mHdrPlusItem != null) { - mHdrPlusItem.setEnabled(true); + if ((advancedFeatures != null) && (advancedFeatures.equals(ubiFocusOn) || + advancedFeatures.equals(chromaFlashOn) || + advancedFeatures.equals(ubiFocusOn))) { + popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false); + popup3.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false); + popup3.setPreferenceEnabled(CameraSettings.KEY_AE_BRACKET_HDR,false); + popup3.setPreferenceEnabled(CameraSettings.KEY_REDEYE_REDUCTION,false); + popup3.setPreferenceEnabled(CameraSettings.KEY_EXPOSURE,false); + popup2.setPreferenceEnabled(CameraSettings.KEY_COLOR_EFFECT,false); + popup2.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC,false); + popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE,false); + + if (mHdrItem != null) { + mHdrItem.setEnabled(false); + } + if (mHdrPlusItem != null) { + mHdrPlusItem.setEnabled(false); + } + } else { + if (mHdrItem != null) { + mHdrItem.setEnabled(true); + } + if (mHdrPlusItem != null) { + mHdrPlusItem.setEnabled(true); + } } } |