commit 68cf90b528231ba39dbc62b3f8f75834d7e36774
author Michael Kolb <kolby@google.com> Mon Oct 15 08:44:27 2012 -0700
committer The Android Automerger <android-build@android.com> Mon Oct 15 16:22:11 2012 -0700
tree 09162d90355f1f11525da426d781d5e4d9b06aac
parent 1e5e86d158b25ff3c5741813856dfd808bc52bed

Set actual zoom value in initialize

  Bug: 7346114

Change-Id: I246d1fe202da9b3fd0f4f016259dea6a929e47a5

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 9ece61a..df1221e 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -709,6 +709,7 @@
         // there is no plan to take advantage of the smooth zoom.
         if (mZoomRenderer != null) {
             mZoomRenderer.setZoomMax(mZoomMax);
+            mZoomRenderer.setZoom(mParameters.getZoom());
             mZoomRenderer.setZoomValue(mZoomRatios.get(mParameters.getZoom()));
             mZoomRenderer.setOnZoomChangeListener(new ZoomChangeListener());
         }

src/com/android/camera/VideoModule.java

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index b4e1dee..c521a09 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2453,6 +2453,7 @@
         // Currently we use immediate zoom for fast zooming to get better UX and
         // there is no plan to take advantage of the smooth zoom.
         mZoomRenderer.setZoomMax(mZoomMax);
+        mZoomRenderer.setZoom(mParameters.getZoom());
         mZoomRenderer.setZoomValue(mZoomRatios.get(mParameters.getZoom()));
         mZoomRenderer.setOnZoomChangeListener(new ZoomChangeListener());
     }

src/com/android/camera/ui/ZoomRenderer.java

diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java
index 95b793c..a1e2705 100644
--- a/src/com/android/camera/ui/ZoomRenderer.java
+++ b/src/com/android/camera/ui/ZoomRenderer.java
@@ -80,6 +80,10 @@
         mMinZoom = 0;
     }
 
+    public void setZoom(int index) {
+        mCircleSize = (int) (mMinCircle + index * (mMaxCircle - mMinCircle) / (mMaxZoom - mMinZoom));
+    }
+
     public void setZoomValue(int value) {
         value = value / 10;
         mZoomSig = value / 10;