commit e4f9891f01bdc10d8f96e4e2429e2f4d0558238b
author Daniel Sandler <dsandler@android.com> Tue Jun 25 15:13:26 2013 -0400
committer Daniel Sandler <dsandler@android.com> Thu Jun 27 15:17:11 2013 -0400
tree 3de05f7433f52bfcade535ab4aa5176675588d56
parent fe7750b5d6cb76a3aa7b1b479e4cc243653fa0c1

Lazily instantiate LauncherAppState.

The application context for LauncherAppState is supplied by
the application whenever it starts; don't ask for an
instance before that.

Change-Id: I1ca8ea04238a357a682f79250f08813ead7ae532

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 5253591..d098805 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -167,9 +167,11 @@
         public void onPageBoundSynchronously(int page);
     }
 
-    LauncherModel(Context context, IconCache iconCache) {
+    LauncherModel(LauncherAppState app, IconCache iconCache) {
+        final Context context = app.getContext();
+
         mAppsCanBeOnExternalStorage = !Environment.isExternalStorageEmulated();
-        mApp = LauncherAppState.getInstance();
+        mApp = app;
         mBgAllAppsList = new AllAppsList(iconCache);
         mIconCache = iconCache;
 
@@ -2323,10 +2325,8 @@
                     for (int i=0; i<N; i++) {
                         if (DEBUG_LOADERS) Log.d(TAG, "mAllAppsList.updatePackage " + packages[i]);
                         mBgAllAppsList.updatePackage(context, packages[i]);
-                        LauncherAppState app =
-                                LauncherAppState.getInstance();
                         WidgetPreviewLoader.removeFromDb(
-                                app.getWidgetPreviewCacheDb(), packages[i]);
+                                mApp.getWidgetPreviewCacheDb(), packages[i]);
                     }
                     break;
                 case OP_REMOVE:
@@ -2334,10 +2334,8 @@
                     for (int i=0; i<N; i++) {
                         if (DEBUG_LOADERS) Log.d(TAG, "mAllAppsList.removePackage " + packages[i]);
                         mBgAllAppsList.removePackage(packages[i]);
-                        LauncherAppState app =
-                                LauncherAppState.getInstance();
                         WidgetPreviewLoader.removeFromDb(
-                                app.getWidgetPreviewCacheDb(), packages[i]);
+                                mApp.getWidgetPreviewCacheDb(), packages[i]);
                     }
                     break;
             }