summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-10-04 14:13:31 -0700
committerztenghui <ztenghui@google.com>2013-10-04 14:26:02 -0700
commit4ab4879eec785faf40ccb346b96963f04af9b0e6 (patch)
tree7ef915d953c175f443fa0fb69369cba2096bf4ff /src
parent187092180b3af64b5d7c2197d1054a860f7cbf45 (diff)
downloadandroid_packages_apps_Snap-4ab4879eec785faf40ccb346b96963f04af9b0e6.tar.gz
android_packages_apps_Snap-4ab4879eec785faf40ccb346b96963f04af9b0e6.tar.bz2
android_packages_apps_Snap-4ab4879eec785faf40ccb346b96963f04af9b0e6.zip
Don't show the option for Gcam when using front camera.
bug:11051221 Change-Id: I802eb0bc73adb3c573a2bf62b312bc681152223d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraSettings.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 3eb0a3256..9c90c5b33 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -222,8 +222,11 @@ public class CameraSettings {
|| !CameraUtil.isCameraHdrSupported(mParameters))) {
removePreference(group, cameraHdr.getKey());
}
- if (cameraHdrPlus != null && (!ApiHelper.HAS_CAMERA_HDR_PLUS
- || !GcamHelper.hasGcamAsHDRMode())) {
+
+ int frontCameraId = CameraHolder.instance().getFrontCameraId();
+ boolean isFrontCamera = (frontCameraId == mCameraId);
+ if (cameraHdrPlus != null && (!ApiHelper.HAS_CAMERA_HDR_PLUS ||
+ !GcamHelper.hasGcamAsHDRMode() || isFrontCamera)) {
removePreference(group, cameraHdrPlus.getKey());
}
}