commit dcd297f05a866e07090d6e2af8fb4b15f28cb555
author Adam Cohen <adamcohen@google.com> Tue Jun 18 13:13:40 2013 -0700
committer Adam Cohen <adamcohen@google.com> Tue Jun 25 12:29:32 2013 -0700
tree 44a2b144c8b298cf12d43145cf0ef4fc55aa0324
parent 211667e4c2efc6b0b7c5037aca77eecd50bd823d

Initial implementation of Shrink-wrap

Change-Id: If73c7f7ca19ca62ff43134f515584354afef8507

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index e115e43..35598a2 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -709,7 +709,10 @@
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        mCellInfo.screen = ((ViewGroup) getParent()).indexOfChild(this);
+        if (getParent() instanceof Workspace) {
+            Workspace workspace = (Workspace) getParent();
+            mCellInfo.screenId = workspace.getIdForScreen(this);
+        }
     }
 
     public void setTagToCellInfoForPoint(int touchX, int touchY) {
@@ -3334,7 +3337,7 @@
         int cellY = -1;
         int spanX;
         int spanY;
-        int screen;
+        long screenId;
         long container;
 
         @Override