Merge "Fix the bug that on-screen zoom ratio is not reset." into gingerbread

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index ea68bed5..f8c44a0f 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -999,7 +999,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
                 settings.getPreferenceGroup(R.xml.camera_preferences),
                 getZoomRatios(), mOrientationCompensation);
         if (mParameters.isZoomSupported()) {
-            mHeadUpDisplay.setZoomIndex(mZoomValue);
             mHeadUpDisplay.setZoomListener(new ZoomControllerListener() {
                 public void onZoomChanged(
                         int index, float ratio, boolean isMoving) {
@@ -1014,6 +1013,9 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
 
     private void attachHeadUpDisplay() {
         mHeadUpDisplay.setOrientation(mOrientationCompensation);
+        if (mParameters.isZoomSupported()) {
+            mHeadUpDisplay.setZoomIndex(mZoomValue);
+        }
         FrameLayout frame = (FrameLayout) findViewById(R.id.frame);
         mGLRootView = new GLRootView(this);
         mGLRootView.setContentPane(mHeadUpDisplay);