diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-08-12 19:13:50 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2011-08-12 19:18:32 +0800 |
commit | 7058a9318dd5d6d5a1e79a84080cdc02975f68c1 (patch) | |
tree | 974aa0cb6f5c24da4a4b17547c71e4908b02f69a /src/com/android/camera/Camera.java | |
parent | d2db70880e6159413932f747eb82df3e925852c1 (diff) | |
download | LegacyCamera-7058a9318dd5d6d5a1e79a84080cdc02975f68c1.zip LegacyCamera-7058a9318dd5d6d5a1e79a84080cdc02975f68c1.tar.gz LegacyCamera-7058a9318dd5d6d5a1e79a84080cdc02975f68c1.tar.bz2 |
Remove zoom ratio text label.
Change-Id: Ia4d54034b0b2c039e874b1fa580b036962f4cd33
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r-- | src/com/android/camera/Camera.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 2e4de8c..86ab4e9 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -70,7 +70,6 @@ import android.view.Window; import android.view.WindowManager; import android.widget.Button; import android.widget.RelativeLayout; -import android.widget.TextView; import android.widget.Toast; import java.io.File; @@ -456,7 +455,7 @@ public class Camera extends ActivityBase implements View.OnClickListener, mZoomMax = mParameters.getMaxZoom(); mSmoothZoomSupported = mParameters.isSmoothZoomSupported(); if (mZoomPicker != null) { - mZoomPicker.setZoomRatios(Util.convertZoomRatios(mParameters.getZoomRatios())); + mZoomPicker.setZoomMax(mZoomMax); mZoomPicker.setZoomIndex(mParameters.getZoom()); mZoomPicker.setSmoothZoomSupported(mSmoothZoomSupported); mZoomPicker.setOnZoomChangeListener( @@ -603,9 +602,8 @@ public class Camera extends ActivityBase implements View.OnClickListener, private void initializeZoomPicker() { View zoomIncrement = findViewById(R.id.zoom_increment); View zoomDecrement = findViewById(R.id.zoom_decrement); - TextView zoomRatio = (TextView) findViewById(R.id.zoom_ratio); if (zoomIncrement != null && zoomDecrement != null && mParameters.isZoomSupported()) { - mZoomPicker = new ZoomPicker(this, zoomIncrement, zoomDecrement, zoomRatio); + mZoomPicker = new ZoomPicker(this, zoomIncrement, zoomDecrement); } } |