1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index fd532fb00..e56b0df07 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -1201,7 +1201,9 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
         mDrawArea.top = t;
         mDrawArea.right = r;
         mDrawArea.bottom = b;
-        if (changed) {
+        // TODO: (tianliu) Need a more robust solution to decide when to re-layout
+        // If in the middle of zooming, only re-layout when the layout has changed.
+        if (!mController.isZoomStarted() || changed) {
             resetZoomView();
             layoutChildren();
         }