From 564343e34ab0e43e131566bf74a9448d1e982ad7 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Thu, 5 Sep 2013 14:15:09 -0700
Subject: Fix black screen in mode switching

Bug: 10632592
Change-Id: I3c8bc1f6a17709d39ec88b51a22edfbbab828bde
---
 src/com/android/camera/ui/FilmStripView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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();
         }
-- 
cgit v1.2.3