diff options
author | Daniel Sandler <dsandler@android.com> | 2013-08-21 13:27:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-21 13:27:27 +0000 |
commit | 2b931429dbf29633657f060151e5451522b44f15 (patch) | |
tree | dee4e3e67d92d7c5b24fd793844ba487ac34b30d /src/com | |
parent | f3007589e346df224d357b389069adfeb266545e (diff) | |
parent | 8707e0fa1ca2c79be862c29cb919b7372f0b6a50 (diff) | |
download | android_packages_apps_Trebuchet-2b931429dbf29633657f060151e5451522b44f15.tar.gz android_packages_apps_Trebuchet-2b931429dbf29633657f060151e5451522b44f15.tar.bz2 android_packages_apps_Trebuchet-2b931429dbf29633657f060151e5451522b44f15.zip |
Merge "Don't use a More Apps folder." into jb-ub-gel-agar
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 71054ffc5..d91fee868 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3822,8 +3822,10 @@ public class Launcher extends Activity */ 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 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(); } |