Initial changes to add configurable hotseat.

Change-Id: I4c2ed4a1c122c057662fabc70bfef7c5c088460b
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 7641fe7..96cd22b 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -732,8 +732,7 @@
         int centeredTop = centerY - height / 2;
 
         // We first fetch the currently visible CellLayoutChildren
-        int page = mLauncher.getWorkspace().getCurrentPage();
-        CellLayout currentPage = (CellLayout) mLauncher.getWorkspace().getChildAt(page);
+        CellLayout currentPage = mLauncher.getWorkspace().getCurrentDropLayout();
         CellLayoutChildren boundingLayout = currentPage.getChildrenLayout();
         Rect bounds = new Rect();
         parent.getDescendantRectRelativeToSelf(boundingLayout, bounds);
@@ -851,8 +850,7 @@
         }
 
         // Remove the folder completely
-        final CellLayout cellLayout = (CellLayout)
-                mLauncher.getWorkspace().getChildAt(mInfo.screen);
+        CellLayout cellLayout = mLauncher.getCellLayout(mInfo.container, mInfo.screen);
         cellLayout.removeView(mFolderIcon);
         if (mFolderIcon instanceof DropTarget) {
             mDragController.removeDropTarget((DropTarget) mFolderIcon);
@@ -860,9 +858,8 @@
         mLauncher.removeFolder(mInfo);
 
         if (finalItem != null) {
-            LauncherModel.addOrMoveItemInDatabase(mLauncher, finalItem,
-                    LauncherSettings.Favorites.CONTAINER_DESKTOP, mInfo.screen,
-                    mInfo.cellX, mInfo.cellY);
+            LauncherModel.addOrMoveItemInDatabase(mLauncher, finalItem, mInfo.container,
+                    mInfo.screen, mInfo.cellX, mInfo.cellY);
         }
         LauncherModel.deleteItemFromDatabase(mLauncher, mInfo);
 
@@ -871,8 +868,8 @@
             View child = mLauncher.createShortcut(R.layout.application, cellLayout,
                     (ShortcutInfo) finalItem);
 
-            mLauncher.getWorkspace().addInScreen(child, mInfo.screen, mInfo.cellX, mInfo.cellY, 
-                    mInfo.spanX, mInfo.spanY);
+            mLauncher.getWorkspace().addInScreen(child, mInfo.container, mInfo.screen, mInfo.cellX,
+                    mInfo.cellY, mInfo.spanX, mInfo.spanY);
         }
     }