commit 7d30a37007bac318db1c9af47a9af12d348042a5
author Adam Cohen <adamcohen@google.com> Mon Jul 01 17:03:59 2013 -0700
committer Adam Cohen <adamcohen@google.com> Mon Jul 08 18:32:57 2013 -0700
tree 83524dc8cd4dd05c0e8ce3a9f5607e3e7c08efee
parent 70c987a0fea53583b22650bed6251e2dcc68bdac

Porting PagedView from KG to gain simplified scaling model, reordering

-> We are no longer scaling individual Celllayouts, instead we are scaling
   the entire Workspace (and the CellLayouts come along for the ride)
-> Due to the above change, many assumptions were broken. In particular,
   our drag and drop / animation archiecture is fairly fragile due to the
   frequent and complex mapping of points between different bits of the
   hierarchy. This CL contains a number of fixes which address such
   breakages.

Change-Id: I2e630eab17528729b764b61f587858f6499fd318

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index cf1a432..4de9297 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -832,10 +832,6 @@
         return true;
     }
 
-    public DropTarget getDropTargetDelegate(DragObject d) {
-        return null;
-    }
-
     private void setupContentDimensions(int count) {
         ArrayList<View> list = getItemsInReadingOrder();
 
@@ -1208,4 +1204,9 @@
             startEditingFolderName();
         }
     }
+
+    @Override
+    public void getHitRectRelativeToDragLayer(Rect outRect) {
+        getHitRect(outRect);
+    }
 }