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/ui/ModuleSwitcher.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/ui/ModuleSwitcher.java')
| -rw-r--r-- | src/com/android/camera/ui/ModuleSwitcher.java | 9 |
1 files changed, 7 insertions, 2 deletions
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]); } |