summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2009-10-30 17:18:23 +0800
committerWu-cheng Li <wuchengli@google.com>2009-10-30 17:29:46 +0800
commit2c854bb917480b69630c9ab01aa9247df57a564a (patch)
tree2e02d3d13059200850d2cfee64d32d205797e1bd /src
parent9c0f684c416ff74b71c289a9c195e9a95b4f0563 (diff)
downloadLegacyCamera-2c854bb917480b69630c9ab01aa9247df57a564a.zip
LegacyCamera-2c854bb917480b69630c9ab01aa9247df57a564a.tar.gz
LegacyCamera-2c854bb917480b69630c9ab01aa9247df57a564a.tar.bz2
Fix the bug that wrong zoom value is set in takePicture.
The application does not getParameters in takePicture due to performance. After smooth zoom, zoom value has been changed. But mParameters of the app still keeps the the old value. This is a regression. b2226717
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/Camera.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 1e30ca0..ddb6611 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -666,6 +666,9 @@ public class Camera extends Activity implements View.OnClickListener,
Log.v(TAG, "ZoomCallback: zoom value=" + zoomValue + ". stopped="
+ stopped);
mZoomValue = zoomValue;
+ // Keep mParameters up to date. We do not getParameter again in
+ // takePicture. If we do not do this, wrong zoom value will be set.
+ mParameters.setZoom(zoomValue);
// We only care if the zoom is stopped. mZooming is set to true when
// we start smooth zoom.
if (stopped) mZooming = false;