commit a182096cb20e0580dfca6661b2e5871c8886c834
author Winson Chung <winsonc@google.com> Mon Oct 03 16:31:06 2011 -0700
committer Winson Chung <winsonc@google.com> Tue Oct 04 11:29:11 2011 -0700
tree 6634c1b30211ae7e165143894fdef4d0d431fa3b
parent 700eef7bc66687ba626e507d93dcb93f829a5fba

Fixing crash when you are dragging an app and the packages change under you. (Bug: 5280181)

- Removing unused dimension for app icon content size

Change-Id: If3910010577e902937d284296479f9a699516de3

src/com/android/launcher2/DragController.java

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index 107f8ef..82aa30f 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -16,6 +16,8 @@
 
 package com.android.launcher2;
 
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
@@ -367,6 +369,21 @@
         }
         endDrag();
     }
+    public void onAppsRemoved(ArrayList<ApplicationInfo> apps, Context context) {
+        // Cancel the current drag if we are removing an app that we are dragging
+        if (mDragObject != null) {
+            Object rawDragInfo = mDragObject.dragInfo;
+            if (rawDragInfo instanceof ShortcutInfo) {
+                ShortcutInfo dragInfo = (ShortcutInfo) rawDragInfo;
+                for (ApplicationInfo info : apps) {
+                    if (dragInfo.intent.getComponent().equals(info.intent.getComponent())) {
+                        cancelDrag();
+                        return;
+                    }
+                }
+            }
+        }
+    }
 
     private void endDrag() {
         if (mDragging) {