summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 2ca6c71fd..b45f07983 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -1568,13 +1568,12 @@ 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)) {
+ String chromaFlashOn = mActivity.getString(R.string
+ .pref_camera_advanced_feature_value_chromaflash_on);
+ if (notSame(pref, CameraSettings.KEY_SCENE_MODE, chromaFlashOn)) {
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));
}