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/LauncherApplication.java

diff --git a/src/com/android/launcher3/LauncherApplication.java b/src/com/android/launcher3/LauncherApplication.java
index 647bf79..8b179f1 100644
--- a/src/com/android/launcher3/LauncherApplication.java
+++ b/src/com/android/launcher3/LauncherApplication.java
@@ -17,22 +17,13 @@
 package com.android.launcher3;
 
 import android.app.Application;
-import android.app.SearchManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Configuration;
-import android.database.ContentObserver;
-import android.os.Handler;
-
-import java.lang.ref.WeakReference;
 
 public class LauncherApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        LauncherAppState.getInstance().init(getApplicationContext());
+        LauncherAppState.setApplicationContext(this);
+        LauncherAppState.getInstance();
     }
 
     @Override