summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x]src/com/android/camera/PhotoModule.java4
-rw-r--r--src/com/android/camera/ui/CameraControls.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 860c29540..ecdae4dd3 100755..100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -4647,6 +4647,10 @@ public class PhotoModule
mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, pref.getValue());
}
+ if (CameraSettings.KEY_ADVANCED_FEATURES.equals(pref.getKey())) {
+ mUI.setPreference(CameraSettings.KEY_QC_CHROMA_FLASH, pref.getValue());
+ }
+
String ubiFocusOff = mActivity.getString(R.string.
pref_camera_advanced_feature_value_ubifocus_off);
String chromaFlashOff = mActivity.getString(R.string.
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index b85d7f1ca..1e28080f4 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -244,8 +244,6 @@ public class CameraControls extends RotatableLayout {
mFrontBackSwitcher.setEnabled(enable);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setEnabled(enable);
- } else {
- mHdrSwitcher.setEnabled(enable);
}
mPreview.setEnabled(enable);