commit 80243449543e034d99da14f068dac609d1a8aa3e
author Michael Jurka <mikejurka@google.com> Mon Sep 26 20:40:52 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 26 20:40:52 2011 -0700
tree 5b3eeb7e4f0645273f6f24dadf6cab36fb99a7b8
parent 6fdc5c91715b68cbba1e50901f2e3c4d657170b6
parent 7bd69e754ccccd3a17b902ddcbb3e447bd07b299

am 7bd69e75: Merge "Making wallpaper width 2x the screen width" into ics-factoryrom

* commit '7bd69e754ccccd3a17b902ddcbb3e447bd07b299':
  Making wallpaper width 2x the screen width

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 2ef3c74..bf18456 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -111,7 +111,7 @@
 
     private final WallpaperManager mWallpaperManager;
     private IBinder mWindowToken;
-    private static final float WALLPAPER_SCREENS_SPAN = 1.5f;
+    private static final float WALLPAPER_SCREENS_SPAN = 2f;
 
     private int mDefaultPage;
 
@@ -730,7 +730,7 @@
             mWallpaperWidth = (int) (maxDim * wallpaperTravelToScreenWidthRatio(maxDim, minDim));
             mWallpaperHeight = (int)(maxDim * wallpaperTravelToScreenHeightRatio(maxDim, minDim));
         } else {
-            mWallpaperWidth = (int) (minDim * WALLPAPER_SCREENS_SPAN);
+            mWallpaperWidth = Math.max((int) (minDim * WALLPAPER_SCREENS_SPAN), maxDim);
             mWallpaperHeight = maxDim;
         }
         new Thread("setWallpaperDimension") {