summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorIvan Evlogiev <ivanevlogiev@codeaurora.org>2014-04-15 12:48:23 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-04-16 17:11:31 -0700
commit4afce8a00fe679fb5721c20799e44fb25d4b9409 (patch)
tree696ccfa7539904841161841ba52842cb8e17a17b /src/com/android/camera/PhotoMenu.java
parentbf4d01f5204843bfee13d1ca9d2908b02aeba166 (diff)
downloadandroid_packages_apps_Snap-4afce8a00fe679fb5721c20799e44fb25d4b9409.tar.gz
android_packages_apps_Snap-4afce8a00fe679fb5721c20799e44fb25d4b9409.tar.bz2
android_packages_apps_Snap-4afce8a00fe679fb5721c20799e44fb25d4b9409.zip
Camera2: Disable HDR if Advanced features are enabled
- Preference also need to be set to off. Menu disable is not enough Change-Id: Ib0a6103021941f370efa68ee6aef058aa7e6106c
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 61b74bed4..dc58c5287 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -302,6 +302,8 @@ public class PhotoMenu extends PieController
popup2.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC,false);
popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE,false);
+ setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
+
if (mHdrItem != null) {
mHdrItem.setEnabled(false);
}