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

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 7b15e9e..9eafc22 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -1066,7 +1066,7 @@
         Runnable onCompleteRunnable = new Runnable() {
             @Override
             public void run() {
-                CellLayout cellLayout = mLauncher.getCellLayout(mInfo.container, mInfo.screen);
+                CellLayout cellLayout = mLauncher.getCellLayout(mInfo.container, mInfo.screenId);
 
                View child = null;
                 // Move the item from the folder to the workspace, in the position of the folder
@@ -1075,7 +1075,7 @@
                     child = mLauncher.createShortcut(R.layout.application, cellLayout,
                             finalItem);
                     LauncherModel.addOrMoveItemInDatabase(mLauncher, finalItem, mInfo.container,
-                            mInfo.screen, mInfo.cellX, mInfo.cellY);
+                            mInfo.screenId, mInfo.cellX, mInfo.cellY);
                 }
                 if (getItemCount() <= 1) {
                     // Remove the folder
@@ -1089,7 +1089,7 @@
                 // We add the child after removing the folder to prevent both from existing at
                 // the same time in the CellLayout.
                 if (child != null) {
-                    mLauncher.getWorkspace().addInScreen(child, mInfo.container, mInfo.screen,
+                    mLauncher.getWorkspace().addInScreen(child, mInfo.container, mInfo.screenId,
                             mInfo.cellX, mInfo.cellY, mInfo.spanX, mInfo.spanY);
                 }
             }