Merge remote branch 'cm/cm-10.1' into cm-10.1

CyanogenMod · Dec 31, 2012 · 81df4ec · 81df4ec
2 parents c980f1e + ee652ca
commit 81df4ec
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
@@ -140,7 +140,11 @@ private void resetHoverColor() {
 
     @Override
     public boolean acceptDrop(DragObject d) {
-        // We can remove everything including App shortcuts, folders, widgets, etc.
+        if (d.dragInfo instanceof ShortcutInfo) {
+            if (((ShortcutInfo) d.dragInfo).itemType == LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS) {
+                return false;
+            }
+        }
         return true;
     }