5 files changed, 2 insertions, 21 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 846af1e..18fe323 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -454,12 +454,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
         }
     }
 
-    private void initializeZoomControl() {
-        mZoomControl = (ZoomControl) findViewById(R.id.zoom_control);
-        if (!mParameters.isZoomSupported()) return;
-        mZoomControl.initialize(this);
-    }
-
     private class ZoomChangeListener implements ZoomControl.OnZoomChangedListener {
         // only for immediate zoom
         @Override
@@ -1021,6 +1015,8 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
             mModePicker.setCurrentMode(ModePicker.MODE_CAMERA);
         }
 
+        mZoomControl = (ZoomControl) findViewById(R.id.zoom_control);
+
         // Make sure preview is started.
         try {
             startPreviewThread.join();
@@ -1040,7 +1036,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
 
         // Do this after starting preview because it depends on camera
         // parameters.
-        initializeZoomControl();
         initializeIndicatorControl();
     }
 
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index da25f9d..5c51fce 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1853,7 +1853,6 @@ public class VideoCamera extends ActivityBase
     private void initializeZoomControl() {
         mZoomControl = (ZoomControl) findViewById(R.id.zoom_control);
         if (!mParameters.isZoomSupported()) return;
-        mZoomControl.initialize(this);
 
         mZoomMax = mParameters.getMaxZoom();
         mSmoothZoomSupported = mParameters.isSmoothZoomSupported();
diff --git a/src/com/android/camera/ui/ZoomControl.java b/src/com/android/camera/ui/ZoomControl.java
index 0c8a765..6ab2573 100644
--- a/src/com/android/camera/ui/ZoomControl.java
+++ b/src/com/android/camera/ui/ZoomControl.java
@@ -80,9 +80,6 @@ public abstract class ZoomControl extends RelativeLayout {
 
     public ZoomControl(Context context, AttributeSet attrs) {
         super(context, attrs);
-    }
-
-    public void initialize(Context context) {
         mZoomIn = addImageView(context, R.drawable.ic_zoom_in_holo_light);
         mZoomSlider = addImageView(context, R.drawable.btn_zoom_slider);
         mZoomOut = addImageView(context, R.drawable.ic_zoom_out_holo_light);
diff --git a/src/com/android/camera/ui/ZoomControlBar.java b/src/com/android/camera/ui/ZoomControlBar.java
index 7046985..7de45e7 100644
--- a/src/com/android/camera/ui/ZoomControlBar.java
+++ b/src/com/android/camera/ui/ZoomControlBar.java
@@ -35,11 +35,6 @@ public class ZoomControlBar extends ZoomControl {
 
     public ZoomControlBar(Context context, AttributeSet attrs) {
         super(context, attrs);
-    }
-
-    @Override
-    public void initialize(Context context) {
-        super.initialize(context);
         mBar = new View(context);
         mBar.setBackgroundResource(R.drawable.ic_zoom_big);
         addView(mBar);
diff --git a/src/com/android/camera/ui/ZoomControlWheel.java b/src/com/android/camera/ui/ZoomControlWheel.java
index 621ab3a..aa8ae4e 100644
--- a/src/com/android/camera/ui/ZoomControlWheel.java
+++ b/src/com/android/camera/ui/ZoomControlWheel.java
@@ -71,15 +71,10 @@ public class ZoomControlWheel extends ZoomControl {
         Resources resources = context.getResources();
         HIGHLIGHT_COLOR = resources.getColor(R.color.review_control_pressed_color);
         TRAIL_COLOR = resources.getColor(R.color.icon_disabled_color);
-    }
 
-    @Override
-    public void initialize(Context context) {
-        super.initialize(context);
         mShutterButtonRadius = IndicatorControlWheelContainer.SHUTTER_BUTTON_RADIUS;
         mStrokeWidth = Util.dpToPixel(IndicatorControlWheelContainer.STROKE_WIDTH);
         mWheelRadius = mShutterButtonRadius + mStrokeWidth * 0.5;
-        requestLayout();
     }
 
     @Override