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 | e2fc40fb3b1103a0c3e8eec48e92d2e989f01dfa (patch) | |
| tree | f5b9f25191d588091c07b4838e9792bfa9f6ee70 | |
| parent | c36b54f76cbad39c9f27faccbe3d596258ca572f (diff) | |
| parent | dc0954ec2aa11564fa1fcc665368c266a966d4bf (diff) | |
| download | android_packages_apps_Snap-e2fc40fb3b1103a0c3e8eec48e92d2e989f01dfa.tar.gz android_packages_apps_Snap-e2fc40fb3b1103a0c3e8eec48e92d2e989f01dfa.tar.bz2 android_packages_apps_Snap-e2fc40fb3b1103a0c3e8eec48e92d2e989f01dfa.zip | |
Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
| -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; |