diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-04 13:54:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-04 13:54:05 -0700 |
| commit | 0eefb1733f5ff2e2f6f4846bdbd8873639b4d085 (patch) | |
| tree | 3c34d48507e1da32213796e5c19e1156a35a78f6 /src | |
| parent | b1a513974d59c1dc14e004338b6795d6c3c5e5e8 (diff) | |
| parent | 7e6537ca106a80aeb4a52182b31ddc9aa642abe5 (diff) | |
| download | android_packages_apps_Gallery2-0eefb1733f5ff2e2f6f4846bdbd8873639b4d085.tar.gz android_packages_apps_Gallery2-0eefb1733f5ff2e2f6f4846bdbd8873639b4d085.tar.bz2 android_packages_apps_Gallery2-0eefb1733f5ff2e2f6f4846bdbd8873639b4d085.zip | |
Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/ui/SlideshowView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/ui/SlideshowView.java b/src/com/android/gallery3d/ui/SlideshowView.java index a057bb748..bb36c47e9 100644 --- a/src/com/android/gallery3d/ui/SlideshowView.java +++ b/src/com/android/gallery3d/ui/SlideshowView.java @@ -142,8 +142,8 @@ public class SlideshowView extends GLView { int viewWidth = getWidth(); int viewHeight = getHeight(); - float initScale = Math.min(2f, Math.min((float) - viewWidth / mWidth, (float) viewHeight / mHeight)); + float initScale = Math.min((float) + viewWidth / mWidth, (float) viewHeight / mHeight); float scale = initScale * (1 + SCALE_SPEED * mProgress); float centerX = viewWidth / 2 + mMovingVector.x * mProgress; |