diff options
| author | Doris Liu <tianliu@google.com> | 2013-09-05 21:44:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 21:44:51 +0000 |
| commit | fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc (patch) | |
| tree | 7c2367c03d40d14c84099d9049ddc6e4e65b89e6 | |
| parent | 33bb2d47fa5850c14f7fe42e07ab6f21585efade (diff) | |
| parent | 564343e34ab0e43e131566bf74a9448d1e982ad7 (diff) | |
| download | android_packages_apps_Snap-fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc.tar.gz android_packages_apps_Snap-fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc.tar.bz2 android_packages_apps_Snap-fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc.zip | |
Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
| -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(); } |