diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2009-10-30 08:58:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-30 08:58:43 -0700 |
| commit | 324b5936db190e06ef4619f89a3deb607de3234a (patch) | |
| tree | 2f614b9f7f280148b4f5b36c7ce0d06a1eee662a /src/com/android/camera/Camera.java | |
| parent | 1f5bc0cfa43fa7ee1b3e7eb75dd72d691df41379 (diff) | |
| parent | 2c854bb917480b69630c9ab01aa9247df57a564a (diff) | |
| download | LegacyCamera-324b5936db190e06ef4619f89a3deb607de3234a.zip LegacyCamera-324b5936db190e06ef4619f89a3deb607de3234a.tar.gz LegacyCamera-324b5936db190e06ef4619f89a3deb607de3234a.tar.bz2 | |
am 2c854bb9: Fix the bug that wrong zoom value is set in takePicture.
Merge commit '2c854bb917480b69630c9ab01aa9247df57a564a' into eclair-mr2
* commit '2c854bb917480b69630c9ab01aa9247df57a564a':
Fix the bug that wrong zoom value is set in takePicture.
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 38677af..835bb89 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -669,6 +669,9 @@ public class Camera extends NoSearchActivity 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; |