summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-12-07 14:16:24 +0800
committerHung-ying Tyan <tyanh@google.com>2010-12-07 14:49:32 +0800
commit17bf7bc255fffcf9ae795a5b3983cd4878383613 (patch)
treefb59046e0ffce4412f15991eb24455f1f4e13bfb /src/com/android/camera/Camera.java
parent067fe861cf3402f2bef3f83995579d3411f0a8b3 (diff)
downloadLegacyCamera-17bf7bc255fffcf9ae795a5b3983cd4878383613.zip
LegacyCamera-17bf7bc255fffcf9ae795a5b3983cd4878383613.tar.gz
LegacyCamera-17bf7bc255fffcf9ae795a5b3983cd4878383613.tar.bz2
Reset camera zoom index in initializeZoom().
The zoom index was not reset when switching between front and back cameras. Also fixes the following bug. Bug: 3108968 Change-Id: If0cee2dc181463bfc97334916c07f5d2e876a5c7
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r--src/com/android/camera/Camera.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index badc18c..98e0e7a 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -453,6 +453,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
mSmoothZoomSupported = mParameters.isSmoothZoomSupported();
if (mZoomPicker != null) {
mZoomPicker.setZoomRatios(getZoomRatios());
+ mZoomPicker.setZoomIndex(mParameters.getZoom());
mZoomPicker.setOnZoomChangeListener(
new ZoomPicker.OnZoomChangedListener() {
public void onZoomChanged(int index) {