summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/LauncherModel.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-04-25 15:48:32 -0700
committerMichael Jurka <mikejurka@google.com>2012-04-25 16:14:16 -0700
commitb85f8a44b51258f22938773ca30dd85845345010 (patch)
tree9b2fdc818df6386f3add58b9c46140b3c2d9948f /src/com/android/launcher2/LauncherModel.java
parent58039d634cb36da561501ccfafc266e1d83d0b4f (diff)
downloadandroid_packages_apps_Trebuchet-b85f8a44b51258f22938773ca30dd85845345010.tar.gz
android_packages_apps_Trebuchet-b85f8a44b51258f22938773ca30dd85845345010.tar.bz2
android_packages_apps_Trebuchet-b85f8a44b51258f22938773ca30dd85845345010.zip
Postpone loading default favorites
- postpone until Launcher activity is created - gives setup wizard time to set flags before we load the default workspace
Diffstat (limited to 'src/com/android/launcher2/LauncherModel.java')
-rw-r--r--src/com/android/launcher2/LauncherModel.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index efe4711aa..37235e960 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -989,6 +989,9 @@ public class LauncherModel extends BroadcastReceiver {
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();