From 8707e0fa1ca2c79be862c29cb919b7372f0b6a50 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Thu, 15 Aug 2013 15:54:18 -0700 Subject: 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 --- src/com/android/launcher3/Launcher.java | 6 ++++-- src/com/android/launcher3/LauncherModel.java | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index a16a33e58..b7d7a2a96 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3826,8 +3826,10 @@ public class Launcher extends Activity */ public void bindAllApplications(final ArrayList 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 50e84b70f..e8103f53d 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -67,6 +67,10 @@ public class LauncherModel extends BroadcastReceiver { 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 @@ public class LauncherModel extends BroadcastReceiver { // 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(); } -- cgit v1.2.3