3 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java
index 9279cc2..9be34b5 100644
--- a/src/com/android/camera/ui/IndicatorControlWheel.java
+++ b/src/com/android/camera/ui/IndicatorControlWheel.java
@@ -367,7 +367,7 @@ public class IndicatorControlWheel extends IndicatorControl implements
 
     private void presetSecondLevelChildRadians() {
         int count = getChildCountByLevel(1);
-        int sectors = (count <= 1) ? 0 : (count - 1);
+        int sectors = (count <= 1) ? 1 : (count - 1);
         double sectorDegrees =
                 ((SECOND_LEVEL_END_DEGREES - SECOND_LEVEL_START_DEGREES) / sectors);
         mSectorRadians[1] = Math.toRadians(sectorDegrees);
diff --git a/src/com/android/camera/ui/ZoomControl.java b/src/com/android/camera/ui/ZoomControl.java
index 6ab2573..be2bdb9 100644
--- a/src/com/android/camera/ui/ZoomControl.java
+++ b/src/com/android/camera/ui/ZoomControl.java
@@ -130,7 +130,11 @@ public abstract class ZoomControl extends RelativeLayout {
         }
         mZoomIndex = index;
         if (mIndexListener != null) {
-            mIndexListener.onZoomIndexChanged(1.0d * mZoomIndex / mZoomMax);
+            if (mZoomMax == 0) {
+                mIndexListener.onZoomIndexChanged(0.0d);
+            } else {
+                mIndexListener.onZoomIndexChanged(1.0d * mZoomIndex / mZoomMax);
+            }
         }
         invalidate();
     }
diff --git a/src/com/android/camera/ui/ZoomControlWheel.java b/src/com/android/camera/ui/ZoomControlWheel.java
index aa8ae4e..bb70ddf 100644
--- a/src/com/android/camera/ui/ZoomControlWheel.java
+++ b/src/com/android/camera/ui/ZoomControlWheel.java
@@ -145,6 +145,7 @@ public class ZoomControlWheel extends ZoomControl {
    }
 
     private double getZoomIndexAngle() {
+        if (mZoomMax == 0) return Math.PI;
         return Math.toRadians(MAX_SLIDER_ANGLE -
                 (MAX_SLIDER_ANGLE - MIN_SLIDER_ANGLE) * mZoomIndex / mZoomMax);
     }