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;
}
}
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 50e84b7..e8103f5 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -67,6 +67,10 @@
static final boolean DEBUG_LOADERS = false;
static final String TAG = "Launcher.Model";
+ // true = use a "More Apps" folder for non-workspace apps on upgrade
+ // false = strew non-workspace apps across the workspace on upgrade
+ public static final boolean UPGRADE_USE_MORE_APPS_FOLDER = false;
+
private static final int ITEMS_CHUNK = 6; // batch size for the workspace icons
private final boolean mAppsCanBeOnRemoveableStorage;
@@ -1473,8 +1477,9 @@
// Ensure that all the applications that are in the system are represented on the home
// screen.
- Log.w(TAG, "10249126 - verifyApplications(" + isUpgrade + ")");
- if (!isUpgrade) {
+ Log.w(TAG, "10249126 - verifyApplications - useMoreApps="
+ + UPGRADE_USE_MORE_APPS_FOLDER + " isUpgrade=" + isUpgrade);
+ if (!UPGRADE_USE_MORE_APPS_FOLDER || !isUpgrade) {
verifyApplications();
}