diff options
Diffstat (limited to 'src/com/android/camera/ui/ModuleSwitcher.java')
| -rw-r--r-- | src/com/android/camera/ui/ModuleSwitcher.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java index 9493d98b7..df76bbde2 100644 --- a/src/com/android/camera/ui/ModuleSwitcher.java +++ b/src/com/android/camera/ui/ModuleSwitcher.java @@ -108,9 +108,8 @@ public class ModuleSwitcher extends RotateImageView --numDrawIds; } - if (!GcamHelper.hasGcamCapture() || GcamHelper.hasGcamAsHDRMode()) { - --numDrawIds; - } + // Always decrement one because of GCam. + --numDrawIds; int[] drawids = new int[numDrawIds]; int[] moduleids = new int[numDrawIds]; @@ -119,9 +118,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() || GcamHelper.hasGcamAsHDRMode())) { - continue; // not enabled, so don't add to UI + if (i == GCAM_MODULE_INDEX) { + continue; // don't add to UI } moduleids[ix] = i; drawids[ix++] = DRAW_IDS[i]; @@ -136,11 +134,11 @@ 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; + if (i == GCAM_MODULE_INDEX) { + setImageResource(R.drawable.ic_switch_camera); + } else { + setImageResource(mDrawIds[i]); } - setImageResource(mDrawIds[i]); } public void setSwitchListener(ModuleSwitchListener l) { |