diff options
| author | John Reck <jreck@google.com> | 2012-10-05 13:15:54 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-10-05 13:15:54 -0700 |
| commit | a65914485de7b82b96b616c7be738ab952e09c83 (patch) | |
| tree | f977d33c19457c7c135e08ceae387b074715ecb7 /src | |
| parent | 7ca5aedd8249a642e3755f3614fc0a43225b4b58 (diff) | |
| download | android_packages_apps_Gallery2-a65914485de7b82b96b616c7be738ab952e09c83.tar.gz android_packages_apps_Gallery2-a65914485de7b82b96b616c7be738ab952e09c83.tar.bz2 android_packages_apps_Gallery2-a65914485de7b82b96b616c7be738ab952e09c83.zip | |
Don't film strip animate when switching cameras
Bug: 7265781
Change-Id: Ibdef7d804923094f3b26471726a642a1b68e9540
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/ui/PositionController.java | 8 |
1 files changed, 4 insertions, 4 deletions
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 { |