Fixing issue where migration all apps folder couldn't be picked up.

- Ensuring that we add items to the non-primary home page
- Fixing issue with drop-target touch handling on tablets

Change-Id: Iea5a383dc735a8f6044a00982f05789f8328ab63

1 files changed, 5 insertions, 5 deletions

diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 054ef2fc1..7b96d6514 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -114,8 +114,9 @@ public class Hotseat extends FrameLayout {
         mContent.removeAllViewsInLayout();
     }
 
-    void addAllAppsFolder(IconCache iconCache, ArrayList<ApplicationInfo> allApps,
-            ArrayList<ComponentName> onWorkspace, Launcher launcher) {
+    void addAllAppsFolder(IconCache iconCache,
+            ArrayList<ApplicationInfo> allApps, ArrayList<ComponentName> onWorkspace,
+            Launcher launcher, Workspace workspace) {
         FolderInfo fi = new FolderInfo();
 
         fi.cellX = getCellXFromOrder(mAllAppsButtonRank);
@@ -130,9 +131,8 @@ public class Hotseat extends FrameLayout {
                 fi.cellY, false);
         FolderIcon folder = FolderIcon.fromXml(R.layout.folder_icon, launcher,
                 getLayout(), fi, iconCache);
-
-        CellLayout.LayoutParams lp = new CellLayout.LayoutParams(fi.cellX,fi.cellY,1,1);
-        mContent.addViewToCellLayout(folder, -1, 0, lp, true);
+        workspace.addInScreen(folder, fi.container, fi.screenId, fi.cellX, fi.cellY,
+                fi.spanX, fi.spanY);
 
         for (ApplicationInfo info: allApps) {
             ComponentName cn = info.intent.getComponent();