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/CustomizePagedView.java

diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index f832b62..cc21276 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -334,35 +334,18 @@
         }
 
         if (enterChoiceMode) {
-            if (v instanceof Checkable) {
-                final Checkable c = (Checkable) v;
-                final boolean wasChecked = c.isChecked();
-                resetCheckedGrandchildren();
-                c.setChecked(!wasChecked);
+            final ItemInfo itemInfo = (ItemInfo) v.getTag();
 
-                // End the current choice mode when we have no items selected
-                /*if (!c.isChecked()) {
-                    endChoiceMode();
-                } else if (isChoiceMode(CHOICE_MODE_NONE)) {
-                    endChoiceMode();
-                    startChoiceMode(CHOICE_MODE_SINGLE, this);
-                }*/
-                mChoiceMode = CHOICE_MODE_SINGLE;
+            Workspace w = mLauncher.getWorkspace();
+            int currentWorkspaceScreen = mLauncher.getCurrentWorkspaceScreen();
+            final CellLayout cl = (CellLayout)w.getChildAt(currentWorkspaceScreen);
 
-                Workspace w = mLauncher.getWorkspace();
-                int currentWorkspaceScreen = mLauncher.getCurrentWorkspaceScreen();
-                final CellLayout cl = (CellLayout)w.getChildAt(currentWorkspaceScreen);
-                cl.setHover(true);
-
-                animateClickFeedback(v, new Runnable() {
-                    @Override
-                    public void run() {
-                        cl.setHover(false);
-                        mLauncher.onWorkspaceClick(cl);
-                        mChoiceMode = CHOICE_MODE_NONE;
-                    }
-                });
-            }
+            animateClickFeedback(v, new Runnable() {
+                @Override
+                public void run() {
+                    mLauncher.addExternalItemToScreen(itemInfo, cl);
+                }
+            });
             return;
         }