Merge branch 'master' into honeycomb-release

src/com/android/launcher2/AllApps3D.java

@@ -922,7 +922,7 @@ public class AllApps3D extends RSSurfaceView
         private int mHeight;
 
         private Resources mRes;
-        ScriptC_Allapps mScript;
+        ScriptC_allapps mScript;
 
         private Mesh mMesh;
         private ProgramVertex.MatrixAllocation mPVA;
@@ -974,7 +974,7 @@ public class AllApps3D extends RSSurfaceView
             mRes = res;
             mWidth = width;
             mHeight = height;
-            mScript = new ScriptC_Allapps(sRS, mRes, R.raw.allapps, true);
+            mScript = new ScriptC_allapps(sRS, mRes, R.raw.allapps, true);
 
             initProgramVertex();
             initProgramFragment();

src/com/android/launcher2/AllAppsPagedView.java

@@ -444,11 +444,6 @@ public class AllAppsPagedView extends PagedView
         return false;
     }
     @Override
-    public Rect estimateDropLocation(DragSource source, int x, int y, int xOffset, int yOffset,
-            DragView dragView, Object dragInfo, Rect recycle) {
-        return null;
-    }
-    @Override
     public DropTarget getDropTargetDelegate(DragSource source, int x, int y, int xOffset,
             int yOffset, DragView dragView, Object dragInfo) {
         return null;

src/com/android/launcher2/ApplicationInfoDropTarget.java

@@ -76,11 +76,6 @@ public class ApplicationInfoDropTarget extends ImageView implements DropTarget,
         return false;
     }
 
-    public Rect estimateDropLocation(DragSource source, int x, int y, int xOffset, int yOffset,
-            DragView dragView, Object dragInfo, Rect recycle) {
-        return null;
-    }
-
     public void onDrop(DragSource source, int x, int y, int xOffset, int yOffset,
             DragView dragView, Object dragInfo) {
 

src/com/android/launcher2/DeleteZone.java

@@ -83,11 +83,6 @@ public class DeleteZone extends ImageView implements DropTarget, DragController.
             DragView dragView, Object dragInfo) {
         return true;
     }
-    
-    public Rect estimateDropLocation(DragSource source, int x, int y, int xOffset, int yOffset,
-            DragView dragView, Object dragInfo, Rect recycle) {
-        return null;
-    }
 
     public void onDrop(DragSource source, int x, int y, int xOffset, int yOffset,
             DragView dragView, Object dragInfo) {

src/com/android/launcher2/DropTarget.java

@@ -88,27 +88,6 @@ public interface DropTarget {
     boolean acceptDrop(DragSource source, int x, int y, int xOffset, int yOffset,
             DragView dragView, Object dragInfo);
 
-    /**
-     * Estimate the surface area where this object would land if dropped at the
-     * given location.
-     * 
-     * @param source DragSource where the drag started
-     * @param x X coordinate of the drop location
-     * @param y Y coordinate of the drop location
-     * @param xOffset Horizontal offset with the object being dragged where the
-     *            original touch happened
-     * @param yOffset Vertical offset with the object being dragged where the
-     *            original touch happened
-     * @param dragView The DragView that's being dragged around on screen.
-     * @param dragInfo Data associated with the object being dragged
-     * @param recycle {@link Rect} object to be possibly recycled.
-     * @return Estimated area that would be occupied if object was dropped at
-     *         the given location. Should return null if no estimate is found,
-     *         or if this target doesn't provide estimations.
-     */
-    Rect estimateDropLocation(DragSource source, int x, int y, int xOffset, int yOffset,
-            DragView dragView, Object dragInfo, Rect recycle);
-
     // These methods are implemented in Views
     void getHitRect(Rect outRect);
     void getLocationOnScreen(int[] loc);

src/com/android/launcher2/FolderIcon.java

@@ -71,11 +71,6 @@ public class FolderIcon extends BubbleTextView implements DropTarget {
                 && item.container != mInfo.id;
     }
 
-    public Rect estimateDropLocation(DragSource source, int x, int y, int xOffset, int yOffset,
-            DragView dragView, Object dragInfo, Rect recycle) {
-        return null;
-    }
-
     public void onDrop(DragSource source, int x, int y, int xOffset, int yOffset,
             DragView dragView, Object dragInfo) {
         ShortcutInfo item;

src/com/android/launcher2/UserFolder.java

@@ -38,11 +38,6 @@ public class UserFolder extends Folder implements DropTarget {
                     itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT)
                 && item.container != mInfo.id;
     }
-    
-    public Rect estimateDropLocation(DragSource source, int x, int y, int xOffset, int yOffset,
-            DragView dragView, Object dragInfo, Rect recycle) {
-        return null;
-    }
 
     public void onDrop(DragSource source, int x, int y, int xOffset, int yOffset,
             DragView dragView, Object dragInfo) {

src/com/android/launcher2/Workspace.java

@@ -1144,39 +1144,6 @@ public class Workspace extends SmoothPagedView
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public Rect estimateDropLocation(DragSource source, int x, int y,
-            int xOffset, int yOffset, DragView dragView, Object dragInfo, Rect recycle) {
-        final CellLayout layout = getCurrentDropLayout();
-
-        final CellLayout.CellInfo cellInfo = mDragInfo;
-        final int spanX = cellInfo == null ? 1 : cellInfo.spanX;
-        final int spanY = cellInfo == null ? 1 : cellInfo.spanY;
-        final View ignoreView = cellInfo == null ? null : cellInfo.cell;
-
-        final Rect location = recycle != null ? recycle : new Rect();
-
-        // Find drop cell and convert into rectangle
-        int[] dropCell = estimateDropCell(x - xOffset, y - yOffset, spanX,
-                spanY, ignoreView, layout, mTempCell);
-
-        if (dropCell == null) {
-            return null;
-        }
-
-        layout.cellToPoint(dropCell[0], dropCell[1], mTempEstimate);
-        location.left = mTempEstimate[0];
-        location.top = mTempEstimate[1];
-
-        layout.cellToPoint(dropCell[0] + spanX, dropCell[1] + spanY, mTempEstimate);
-        location.right = mTempEstimate[0];
-        location.bottom = mTempEstimate[1];
-
-        return location;
-    }
-
     /**
      * Calculate the nearest cell where the given object would be dropped.
      */