Don't use a More Apps folder.

Instead, "extra" icons (which were not previously workspace
shortcuts) will be strewn across your workspace.

Change-Id: Ie8a7b533bb3c94bec3aa8fc7c7c8d3bea7eef485
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a16a33e..b7d7a2a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3826,8 +3826,10 @@
      */
     public void bindAllApplications(final ArrayList<ApplicationInfo> apps) {
         if (mIntentsOnWorkspaceFromUpgradePath != null) {
-            getHotseat().addAllAppsFolder(mIconCache, apps,
-                    mIntentsOnWorkspaceFromUpgradePath, Launcher.this, mWorkspace);
+            if (LauncherModel.UPGRADE_USE_MORE_APPS_FOLDER) {
+                getHotseat().addAllAppsFolder(mIconCache, apps,
+                        mIntentsOnWorkspaceFromUpgradePath, Launcher.this, mWorkspace);
+            }
             mIntentsOnWorkspaceFromUpgradePath = null;
         }
     }