Workspace: Hotseat fixes

Change-Id: Ieceed18c47bc3b6d6194506f0d7545c4513befa0

1 files changed, 7 insertions, 4 deletions

diff --git a/src/com/cyanogenmod/trebuchet/DragLayer.java b/src/com/cyanogenmod/trebuchet/DragLayer.java
index 420dfd550..e26a2915a 100644
--- a/src/com/cyanogenmod/trebuchet/DragLayer.java
+++ b/src/com/cyanogenmod/trebuchet/DragLayer.java
@@ -27,6 +27,7 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -42,6 +43,7 @@ import android.widget.TextView;
 import com.cyanogenmod.trebuchet.R;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * A ViewGroup that coordinates dragging across its descendants
@@ -303,8 +305,8 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
             pt[1] += view.getTop() - view.getScrollY();
             viewParent = view.getParent();
         }
-        coord[0] = (int) Math.round(pt[0]);
-        coord[1] = (int) Math.round(pt[1]);
+        coord[0] = Math.round(pt[0]);
+        coord[1] = Math.round(pt[1]);
         return scale;
     }
 
@@ -743,10 +745,11 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
         if (mInScrollArea && !LauncherApplication.isScreenLarge()) {
             Workspace workspace = mLauncher.getWorkspace();
             int width = workspace.getWidth();
+            int page = workspace.getNextPage();
+
             Rect childRect = new Rect();
-            getDescendantRectRelativeToSelf(workspace.getChildAt(0), childRect);
+            getDescendantRectRelativeToSelf(workspace.getChildAt(page), childRect);
 
-            int page = workspace.getNextPage();
             CellLayout leftPage = (CellLayout) workspace.getChildAt(page - 1);
             CellLayout rightPage = (CellLayout) workspace.getChildAt(page + 1);