commit a4be3693b5df867b30a9f99d22cdab89cb1f7f49
author The Android Open Source Project <initial-contribution@android.com> Mon May 11 16:40:44 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon May 11 16:40:44 2009 -0700
tree eb32c6e96ad3d5d9c9a01ebfba482e77d458a64a
parent 6541ead358ccd9e40d212c7e8eb93ee3e1428ffc

temporarily undo 6541ead358ccd9e40d212c7e8eb93ee3e1428ffc to fix the build

src/com/android/launcher/Workspace.java

diff --git a/src/com/android/launcher/Workspace.java b/src/com/android/launcher/Workspace.java
index b246ddb..f20572e 100644
--- a/src/com/android/launcher/Workspace.java
+++ b/src/com/android/launcher/Workspace.java
@@ -457,11 +457,6 @@
     }
 
     @Override
-    public boolean isOpaque() {
-        return !mWallpaper.hasAlpha();
-    }
-
-    @Override
     protected void dispatchDraw(Canvas canvas) {
         boolean restore = false;
 
@@ -920,7 +915,7 @@
                     originalCellLayout.removeView(cell);
                     cellLayout.addView(cell);
                 }
-                mTargetCell = estimateDropCell(x - xOffset, y - yOffset,
+                mTargetCell = estimateDropCell(source, x - xOffset, y - yOffset,
                         mDragInfo.spanX, mDragInfo.spanY, cell, cellLayout, mTargetCell);
                 cellLayout.onDropChild(cell, mTargetCell);
 
@@ -977,7 +972,7 @@
 
         cellLayout.addView(view, insertAtFirst ? 0 : -1);
         view.setOnLongClickListener(mLongClickListener);
-        mTargetCell = estimateDropCell(x, y, 1, 1, view, cellLayout, mTargetCell);
+        mTargetCell = estimateDropCell(null, x, y, 1, 1, view, cellLayout, mTargetCell);
         cellLayout.onDropChild(view, mTargetCell);
         CellLayout.LayoutParams lp = (CellLayout.LayoutParams) view.getLayoutParams();
 
@@ -1020,7 +1015,7 @@
         final Rect location = recycle != null ? recycle : new Rect();
         
         // Find drop cell and convert into rectangle
-        int[] dropCell = estimateDropCell(x - xOffset, y - yOffset,
+        int[] dropCell = estimateDropCell(source, x - xOffset, y - yOffset,
                 spanX, spanY, ignoreView, layout, mTempCell);
         
         if (dropCell == null) {
@@ -1041,7 +1036,7 @@
     /**
      * Calculate the nearest cell where the given object would be dropped.
      */
-    private int[] estimateDropCell(int pixelX, int pixelY,
+    private int[] estimateDropCell(DragSource source, int pixelX, int pixelY,
             int spanX, int spanY, View ignoreView, CellLayout layout, int[] recycle) {
         // Create vacant cell cache if none exists
         if (mVacantCache == null) {