From 24ab2f1bb59a1b15f80bd398c7e3e3b3c98599fb Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 16 Sep 2010 14:10:47 -0700
Subject: [PATCH] Fixing set wallpaper crash in Launcher

Change-Id: I3b6299bb10f397209cd69e715fee783abe0c9b64
---
 .../android/launcher2/CustomizePagedView.java  | 18 +++++-------------
 src/com/android/launcher2/Launcher.java        |  4 ++++
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index 6e7f9b6b86..8fb3025c0d 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -231,19 +231,11 @@ public class CustomizePagedView extends PagedView
                 public void run() {
                     // add the shortcut
                     ResolveInfo info = (ResolveInfo) animView.getTag();
-                    Intent createShortcutIntent = new Intent(Intent.ACTION_CREATE_SHORTCUT);
-                    if (info.labelRes == R.string.group_applications) {
-                        // Create app shortcuts is a special built-in case of shortcuts
-                        createShortcutIntent.putExtra(
-                                Intent.EXTRA_SHORTCUT_NAME,getContext().getString(
-                                        R.string.group_applications));
-                    } else {
-                        ComponentName name = new ComponentName(info.activityInfo.packageName,
-                                info.activityInfo.name);
-                        createShortcutIntent.setComponent(name);
-                    }
-                    mLauncher.prepareAddItemFromHomeCustomizationDrawer();
-                    mLauncher.processShortcut(createShortcutIntent);
+                    Intent createWallpapersIntent = new Intent(Intent.ACTION_SET_WALLPAPER);
+                    ComponentName name = new ComponentName(info.activityInfo.packageName,
+                            info.activityInfo.name);
+                    createWallpapersIntent.setComponent(name);
+                    mLauncher.processWallpaper(createWallpapersIntent);
                 }
             });
         }
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 8eece96046..d619aa2cec 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1459,6 +1459,10 @@ public final class Launcher extends Activity
         }
     }
 
+    void processWallpaper(Intent intent) {
+        startActivityForResult(intent, REQUEST_PICK_WALLPAPER);
+    }
+
     void addLiveFolder(Intent intent) {
         // Handle case where user selected "Folder"
         String folderName = getResources().getString(R.string.group_folder);