diff options
author | Doris Liu <tianliu@google.com> | 2013-09-05 14:15:09 -0700 |
---|---|---|
committer | Doris Liu <tianliu@google.com> | 2013-09-05 14:15:09 -0700 |
commit | 564343e34ab0e43e131566bf74a9448d1e982ad7 (patch) | |
tree | b7bc2034dc531a0fcd6c1bd5ece58bc2b9e5b451 | |
parent | 5633994ecddb26bdd7a577a5b015b95bcb33e309 (diff) | |
download | android_packages_apps_Snap-564343e34ab0e43e131566bf74a9448d1e982ad7.tar.gz android_packages_apps_Snap-564343e34ab0e43e131566bf74a9448d1e982ad7.tar.bz2 android_packages_apps_Snap-564343e34ab0e43e131566bf74a9448d1e982ad7.zip |
Fix black screen in mode switching
Bug: 10632592
Change-Id: I3c8bc1f6a17709d39ec88b51a22edfbbab828bde
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 4 |
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(); } |