diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-09-25 21:38:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-25 21:38:51 +0000 |
| commit | 15ccccf6df50b465514eef85f64393d6f2022e0d (patch) | |
| tree | 626d41b5e4b4c4c32afda38b2cdba4527f2ab14b /src | |
| parent | c9c1504408819bda3fb6b2b264f9dbf6012f9b7f (diff) | |
| parent | dfe80098600f092735e9fcb23d8a17b8de23cdef (diff) | |
| download | android_packages_apps_Snap-15ccccf6df50b465514eef85f64393d6f2022e0d.tar.gz android_packages_apps_Snap-15ccccf6df50b465514eef85f64393d6f2022e0d.tar.bz2 android_packages_apps_Snap-15ccccf6df50b465514eef85f64393d6f2022e0d.zip | |
Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 6 |
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()); } } |