summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-12-13 04:44:37 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-12-13 04:44:37 -0800
commitbf220f28502268d071d5466107650c0e9fe90268 (patch)
tree9286acba592e2d76b5a5b9691f92e0c81fd41326
parentcda93e3f8a3ac1b4e6bbf871c6a0ed959e233dad (diff)
parentb5f33bc3d537ea83b2f9136987f307ef8d7dcf67 (diff)
downloadandroid_packages_apps_Snap-bf220f28502268d071d5466107650c0e9fe90268.tar.gz
android_packages_apps_Snap-bf220f28502268d071d5466107650c0e9fe90268.tar.bz2
android_packages_apps_Snap-bf220f28502268d071d5466107650c0e9fe90268.zip
Merge "Camera2: Reset zoom parameter after update"
-rw-r--r--src/com/android/camera/ui/FilmStripView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 8c2909881..bc40b06b3 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -1966,6 +1966,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
return;
}
if (reporter.isDataUpdated(dataId)) {
+ resetZoomView();
updateViewItem(mCurrentItem);
final ImageData data = mDataAdapter.getImageData(dataId);
if (!mIsUserScrolling && !mController.isScrolling()) {