commit 7bd69e754ccccd3a17b902ddcbb3e447bd07b299
author Michael Jurka <mikejurka@google.com> Mon Sep 26 16:51:35 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 26 16:51:35 2011 -0700
tree 2f14f39c901ceb3eee69f5befba4e57eff43658c
parent 16172b698c21f1d627cf7850d60c0a73b130683d
parent 1670698ff3502548aa066e32c28ecf62c5592a34

Merge "Making wallpaper width 2x the screen width" into ics-factoryrom

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") {