X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcom%2Fcooliris%2Fwallpaper%2FSlideshow.java;h=376a739253d100768608cb2b38dccbdffe8988b2;hb=db87908d640e17ef0946824be158d86c6e2d6836;hp=fdd3a17e7f8a3a139001a8884b3791f046f2b946;hpb=d8a6d17db8aaef2ea06c78fe643f06601d8aec5d;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/src/com/cooliris/wallpaper/Slideshow.java b/src/com/cooliris/wallpaper/Slideshow.java
index fdd3a17e7..376a73925 100644
--- a/src/com/cooliris/wallpaper/Slideshow.java
+++ b/src/com/cooliris/wallpaper/Slideshow.java
@@ -24,7 +24,7 @@ public class Slideshow extends SurfaceView implements SurfaceHolder.Callback {
         holder.addCallback(this);
     }
 
-    public static final int SLIDESHOW_DURATION = 5000;
+    public static final int SLIDESHOW_DURATION = 2000;
 
     public interface DataSource {
         /**
@@ -126,7 +126,6 @@ public class Slideshow extends SurfaceView implements SurfaceHolder.Callback {
                         performUpdate(mQueuedFrameRect, sQueuedGrow, delta);
                         if (alpha >= 1.0f) {
                             // We switch the image.
-                            mBitmap.recycle();
                             mRect = mQueuedRect;
                             mBitmap = mQueuedBitmap;
                             mFrameRect =  mQueuedFrameRect;
@@ -156,7 +155,7 @@ public class Slideshow extends SurfaceView implements SurfaceHolder.Callback {
 
     private void performUpdate(RectF rect, Vector3f grow, long delta) {
         float timeElapsed = ((float)(delta)) / 1000.0f;
-        float amountToGrowX = timeElapsed * (rect.width() / 30.0f);
+        float amountToGrowX = timeElapsed * (rect.width() / 15.0f);
         float amountToGrowY = amountToGrowX * (rect.height() / rect.width());
         rect.top -= amountToGrowY * grow.x;
         rect.left -= amountToGrowX * grow.y;