summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-03-30 00:47:57 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-03-30 00:47:57 -0700
commitedea332aa8a58edf4af635a2da31585f45998366 (patch)
tree0cca31a35a510593d3a5f6c23e7d8d1dc1658e6d
parent8bb2b9499756af5348e538b7cc70c1e346e94cc6 (diff)
parentcd117f438369f09c258926f3345fdc0f007762d7 (diff)
downloadandroid_packages_apps_Snap-edea332aa8a58edf4af635a2da31585f45998366.tar.gz
android_packages_apps_Snap-edea332aa8a58edf4af635a2da31585f45998366.tar.bz2
android_packages_apps_Snap-edea332aa8a58edf4af635a2da31585f45998366.zip
Merge "Camera2: Disable some conflict items when HDR on"
-rw-r--r--src/com/android/camera/PhotoMenu.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index d93c8ddbc..3330b01aa 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -261,6 +261,9 @@ public class PhotoMenu extends PieController
if ((faceDetection != null) && !Parameters.FACE_DETECTION_ON.equals(faceDetection)){
popup2.setPreferenceEnabled(CameraSettings.KEY_FACE_RECOGNITION,false);
}
+ if (mListener != null) {
+ mListener.onSharedPreferenceChanged();
+ }
}
public void popupDismissed() {