commit 430c53bc80be01996b45e55687885d6c05314645
author Patrick Dubroy <dubroy@google.com> Wed Sep 08 16:01:19 2010 -0700
committer Patrick Dubroy <dubroy@google.com> Wed Sep 08 16:05:51 2010 -0700
tree 6af2f75b3fb0544cb632c91d402651417fa8cd3b
parent 5aa323f3c9cc8580335f5594ea8900fe33c00fbc

Fix 2981705: Unable to uninstall downloaded app by dragging to trash.

- on long press, copy constructor of ApplicationInfo is called. It wasn't copying flags.
- also fix all apps choice mode so that chosen object is set when preparing CAB

src/com/android/launcher2/AllAppsPagedView.java

diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java
index b1275b8..1c2fa12 100644
--- a/src/com/android/launcher2/AllAppsPagedView.java
+++ b/src/com/android/launcher2/AllAppsPagedView.java
@@ -204,11 +204,6 @@
             return false;
         }
 
-        // start the choice mode, and select the item that was long-pressed
-        if (isChoiceMode(CHOICE_MODE_NONE)) {
-            startChoiceMode(CHOICE_MODE_SINGLE, this);
-        }
-
         if (v instanceof Checkable) {
             // In preparation for drag, we always reset the checked grand children regardless of
             // what choice mode we are in
@@ -219,6 +214,11 @@
             c.toggle();
         }
 
+        // Start choice mode AFTER the item is selected
+        if (isChoiceMode(CHOICE_MODE_NONE)) {
+            startChoiceMode(CHOICE_MODE_SINGLE, this);
+        }
+
         ApplicationInfo app = (ApplicationInfo) v.getTag();
         app = new ApplicationInfo(app);
 
@@ -399,6 +399,7 @@
     @Override
     public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
         mode.setTitle(R.string.cab_selection_text);
+
         menu.add(0, MENU_APP_INFO, 0, R.string.cab_menu_app_info)
                 .setIcon(R.drawable.info_button);
         menu.add(0, MENU_DELETE_APP, 0, R.string.cab_menu_delete_app)
@@ -423,8 +424,7 @@
         final int id = item.getItemId();
 
         // Assumes that we are in CHOICE_MODE_SINGLE
-        final View chosenView = (View) getSingleCheckedGrandchild();
-        final ApplicationInfo appInfo = (ApplicationInfo) chosenView.getTag();
+        final ApplicationInfo appInfo = (ApplicationInfo) getChosenItem();
 
         if (id == MENU_APP_INFO) {
             mLauncher.startApplicationDetailsActivity(appInfo.componentName);