commit b85f8a44b51258f22938773ca30dd85845345010
author Michael Jurka <mikejurka@google.com> Wed Apr 25 15:48:32 2012 -0700
committer Michael Jurka <mikejurka@google.com> Wed Apr 25 16:14:16 2012 -0700
tree 9b2fdc818df6386f3add58b9c46140b3c2d9948f
parent 58039d634cb36da561501ccfafc266e1d83d0b4f

Postpone loading default favorites

- postpone until Launcher activity is created
- gives setup wizard time to set flags before
we load the default workspace

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index efe4711..37235e9 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -989,6 +989,9 @@
             final AppWidgetManager widgets = AppWidgetManager.getInstance(context);
             final boolean isSafeMode = manager.isSafeMode();
 
+            // Make sure the default workspace is loaded, if needed
+            mApp.getLauncherProvider().loadDefaultFavoritesIfNecessary();
+
             sWorkspaceItems.clear();
             sAppWidgets.clear();
             sFolders.clear();