From 4601f5d987ad2f57db6b1b65a716f00308e5ae99 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Tue, 24 Sep 2013 18:35:22 -0700 Subject: Enable gcam as HDR pie menu option. Bug: 10430748 Change-Id: I0f589126bac895b31ef7475afd093680766de39e --- src/com/android/camera/ui/ModuleSwitcher.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/com/android/camera/ui/ModuleSwitcher.java') diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java index 882f6c931..7c74651f6 100644 --- a/src/com/android/camera/ui/ModuleSwitcher.java +++ b/src/com/android/camera/ui/ModuleSwitcher.java @@ -108,7 +108,7 @@ public class ModuleSwitcher extends RotateImageView --numDrawIds; } - if (!GcamHelper.hasGcamCapture(context)) { + if (!GcamHelper.hasGcamCapture(context) || GcamHelper.hasGcamAsHDRMode()) { --numDrawIds; } @@ -119,7 +119,8 @@ public class ModuleSwitcher extends RotateImageView if (i == LIGHTCYCLE_MODULE_INDEX && !PhotoSphereHelper.hasLightCycleCapture(context)) { continue; // not enabled, so don't add to UI } - if (i == GCAM_MODULE_INDEX && !GcamHelper.hasGcamCapture(context)) { + if (i == GCAM_MODULE_INDEX + && (!GcamHelper.hasGcamCapture(context) || GcamHelper.hasGcamAsHDRMode())) { continue; // not enabled, so don't add to UI } moduleids[ix] = i; @@ -135,6 +136,10 @@ public class ModuleSwitcher extends RotateImageView public void setCurrentIndex(int i) { mCurrentIndex = i; + if (i == GCAM_MODULE_INDEX && GcamHelper.hasGcamAsHDRMode()) { + setImageResource(R.drawable.ic_switch_camera); + return; + } setImageResource(mDrawIds[i]); } -- cgit v1.2.3