summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-09-25 14:31:49 -0700
committerSascha Haeberling <haeberling@google.com>2013-09-25 14:31:49 -0700
commitdfe80098600f092735e9fcb23d8a17b8de23cdef (patch)
tree579d117c8a04a5566f54116d5a05760fd061b854 /src
parentb998a491a5b24e710bc1711dbb00cbfa05273bf2 (diff)
downloadandroid_packages_apps_Snap-dfe80098600f092735e9fcb23d8a17b8de23cdef.tar.gz
android_packages_apps_Snap-dfe80098600f092735e9fcb23d8a17b8de23cdef.tar.bz2
android_packages_apps_Snap-dfe80098600f092735e9fcb23d8a17b8de23cdef.zip
Fix the checks for when to remove the HDR/HQ icons from the pie menu.
Bug: 10932511 Change-Id: I4d80d028335c2f45c5c59d56898846a76755ec44
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraSettings.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 6faabcd5b..fea544dec 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -218,12 +218,12 @@ public class CameraSettings {
if (videoEffect != null) {
filterUnsupportedOptions(group, videoEffect, null);
}
- if (cameraHdr != null && !ApiHelper.HAS_CAMERA_HDR
- || !CameraUtil.isCameraHdrSupported(mParameters)) {
+ if (cameraHdr != null && (!ApiHelper.HAS_CAMERA_HDR
+ || !CameraUtil.isCameraHdrSupported(mParameters))) {
removePreference(group, cameraHdr.getKey());
}
if (cameraHq != null && (!ApiHelper.HAS_CAMERA_HQ
- | !GcamHelper.hasGcamAsHDRMode())) {
+ || !GcamHelper.hasGcamAsHDRMode())) {
removePreference(group, cameraHq.getKey());
}
}