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/ItemInfo.java

diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java
index fb41834..1d7ebba 100644
--- a/src/com/android/launcher3/ItemInfo.java
+++ b/src/com/android/launcher3/ItemInfo.java
@@ -55,7 +55,7 @@
     /**
      * Iindicates the screen in which the shortcut appears.
      */
-    int screen = -1;
+    long screenId = -1;
     
     /**
      * Indicates the X position of the associated cell.
@@ -111,7 +111,7 @@
         cellY = info.cellY;
         spanX = info.spanX;
         spanY = info.spanY;
-        screen = info.screen;
+        screenId = info.screenId;
         itemType = info.itemType;
         container = info.container;
         // tempdebug:
@@ -141,7 +141,7 @@
     void onAddToDatabase(ContentValues values) { 
         values.put(LauncherSettings.BaseLauncherColumns.ITEM_TYPE, itemType);
         values.put(LauncherSettings.Favorites.CONTAINER, container);
-        values.put(LauncherSettings.Favorites.SCREEN, screen);
+        values.put(LauncherSettings.Favorites.SCREEN, screenId);
         values.put(LauncherSettings.Favorites.CELLX, cellX);
         values.put(LauncherSettings.Favorites.CELLY, cellY);
         values.put(LauncherSettings.Favorites.SPANX, spanX);
@@ -188,7 +188,7 @@
     @Override
     public String toString() {
         return "Item(id=" + this.id + " type=" + this.itemType + " container=" + this.container
-            + " screen=" + screen + " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX
+            + " screen=" + screenId + " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX
             + " spanY=" + spanY + " dropPos=" + dropPos + ")";
     }
 }