commit 6b4b25d093b0a3008d6e275438c79db9c21daab9
author Michael Jurka <mikejurka@google.com> Wed Oct 20 18:19:45 2010 -0700
committer Michael Jurka <mikejurka@google.com> Wed Oct 20 20:00:44 2010 -0700
tree 2aa6dd149d7abf43b86f12e902841d561ed9be12
parent df4b83dd9d6380ab963c62d1f9d1312efc87cb0f

fixed bug with adding items in customize mode

also, no longer mark items as checked in customize mode

Bug: 3116708

Change-Id: I01b935ba8bfb450dfab9175a7eb5b7619ad187a6

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 6fcf432..2688e54 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2669,24 +2669,14 @@
         }
     }
 
-    void onWorkspaceClick(CellLayout layout) {
-        Object itemInfo = mAllAppsPagedView.getChosenItem();
-        if (itemInfo == null) {
-            itemInfo = mCustomizePagedView.getChosenItem();
+    void addExternalItemToScreen(ItemInfo itemInfo, CellLayout layout) {
+        if (!mWorkspace.addExternalItemToScreen(itemInfo, layout)) {
+            showOutOfSpaceMessage();
         }
+    }
 
-        if (itemInfo == null) {
-            // No items are chosen in All Apps or Customize, so just zoom into the workspace
-            showWorkspace(true, layout);
-        } else {
-            // Act as if the chosen item was dropped on the given CellLayout
-            if (mWorkspace.addExternalItemToScreen(itemInfo, layout)) {
-                mAllAppsPagedView.endChoiceMode();
-                mCustomizePagedView.endChoiceMode();
-            } else {
-                showOutOfSpaceMessage();
-            }
-        }
+    void onWorkspaceClick(CellLayout layout) {
+        showWorkspace(true, layout);
     }
 
     private void updateButtonWithIconFromExternalActivity(