1 files changed, 9 insertions, 4 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index 27f1a53aa..2b253fd75 100755
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -286,7 +286,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
             CropView c = a.getCropView();
 
             Drawable defaultWallpaper = WallpaperManager.getInstance(a).getBuiltInDrawable(
-                    c.getWidth(), c.getHeight(), false, 0.5f, 0.5f);
+                    0, 0, false, 0.5f, 0.5f);
 
             if (defaultWallpaper == null) {
                 Log.w(TAG, "Null default wallpaper encountered.");
@@ -294,9 +294,14 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
                 return;
             }
 
-            c.setTileSource(
-                    new DrawableTileSource(a, defaultWallpaper, DrawableTileSource.MAX_PREVIEW_SIZE), null);
-            c.setScale(1f);
+            c.setTileSource(new DrawableTileSource(
+                    a, defaultWallpaper, DrawableTileSource.MAX_PREVIEW_SIZE), null);
+            Point wallpaperSize = WallpaperCropActivity.getDefaultWallpaperSize(
+                    a.getResources(), a.getWindowManager());
+            RectF crop = WallpaperCropActivity.getMaxCropRect(
+                    defaultWallpaper.getIntrinsicWidth(), defaultWallpaper.getIntrinsicHeight(),
+                    wallpaperSize.x, wallpaperSize.y, false);
+            c.setScale(wallpaperSize.x / crop.width());
             c.setTouchEnabled(false);
             a.setSystemWallpaperVisiblity(false);
         }