From a65914485de7b82b96b616c7be738ab952e09c83 Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 5 Oct 2012 13:15:54 -0700 Subject: Don't film strip animate when switching cameras Bug: 7265781 Change-Id: Ibdef7d804923094f3b26471726a642a1b68e9540 --- src/com/android/gallery3d/ui/PositionController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/ui/PositionController.java b/src/com/android/gallery3d/ui/PositionController.java index 45b5ec6b3..fffa7e038 100644 --- a/src/com/android/gallery3d/ui/PositionController.java +++ b/src/com/android/gallery3d/ui/PositionController.java @@ -319,10 +319,10 @@ class PositionController { b.mImageW = width; b.mImageH = height; - // If this is the first time we receive an image size, we change the - // scale directly. Otherwise adjust the scales by a ratio, and snapback - // will animate the scale into the min/max bounds if necessary. - if (wasViewSize && !isViewSize) { + // If this is the first time we receive an image size or we are in fullscreen, + // we change the scale directly. Otherwise adjust the scales by a ratio, + // and snapback will animate the scale into the min/max bounds if necessary. + if ((wasViewSize && !isViewSize) || !mFilmMode) { b.mCurrentScale = getMinimalScale(b); b.mAnimationStartTime = NO_ANIMATION; } else { -- cgit v1.2.3