diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-09-24 18:35:22 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2013-09-24 18:35:22 -0700 |
| commit | 4601f5d987ad2f57db6b1b65a716f00308e5ae99 (patch) | |
| tree | e9fb58b7a79a57c8c391f2c1f2ff446568f62f51 /src/com/android/camera/CameraSettings.java | |
| parent | e0bf566d4ab2c45e05635397bdfd6c9f9a92a356 (diff) | |
| download | android_packages_apps_Snap-4601f5d987ad2f57db6b1b65a716f00308e5ae99.tar.gz android_packages_apps_Snap-4601f5d987ad2f57db6b1b65a716f00308e5ae99.tar.bz2 android_packages_apps_Snap-4601f5d987ad2f57db6b1b65a716f00308e5ae99.zip | |
Enable gcam as HDR pie menu option.
Bug: 10430748
Change-Id: I0f589126bac895b31ef7475afd093680766de39e
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 2ae2353af..19d0fda56 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -30,6 +30,7 @@ import android.util.Log; import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; +import com.android.camera.util.GcamHelper; import com.android.camera2.R; import java.util.ArrayList; @@ -215,8 +216,8 @@ public class CameraSettings { if (videoEffect != null) { filterUnsupportedOptions(group, videoEffect, null); } - if (cameraHdr != null && (!ApiHelper.HAS_CAMERA_HDR - || !CameraUtil.isCameraHdrSupported(mParameters))) { + if (cameraHdr != null && !GcamHelper.hasGcamAsHDRMode() + && (!ApiHelper.HAS_CAMERA_HDR || !CameraUtil.isCameraHdrSupported(mParameters))) { removePreference(group, cameraHdr.getKey()); } } |