diff options
| author | Camera Software Integration <camswint@localhost> | 2016-11-02 23:33:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-02 23:33:12 -0700 |
| commit | a90e7199a3b299fd09557de73440d9890eea8298 (patch) | |
| tree | 35f775800d58061e26297291d9afead3ca5a891a /src/com/android/camera/CaptureModule.java | |
| parent | 094a05f3291b336644e358f02c446dec41859e6f (diff) | |
| parent | 1ecf41fcb4c095308ed48daed79d88f8416832c3 (diff) | |
| download | android_packages_apps_Snap-a90e7199a3b299fd09557de73440d9890eea8298.tar.gz android_packages_apps_Snap-a90e7199a3b299fd09557de73440d9890eea8298.tar.bz2 android_packages_apps_Snap-a90e7199a3b299fd09557de73440d9890eea8298.zip | |
Merge "SnapdragonCamera: Reset zoom value when resuming" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 6c7af2a74..a7f716797 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1829,6 +1829,7 @@ public class CaptureModule implements CameraModule, PhotoController, mState[i] = STATE_PREVIEW; } mLongshotActive = false; + mZoomValue = 1.0f; } private ArrayList<Integer> getFrameProcFilterId() { |