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

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 0d088ac..9bc1e74 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -23,7 +23,6 @@
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
@@ -51,7 +50,6 @@
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.android.launcher3.R;
 import com.android.launcher3.DropTarget.DragObject;
 
 import java.util.ArrayList;
@@ -362,7 +360,7 @@
             Configuration.ORIENTATION_LANDSCAPE;
         int maxCellCountX = Integer.MAX_VALUE;
         int maxCellCountY = Integer.MAX_VALUE;
-        if (LauncherAppState.isScreenLarge()) {
+        if (LauncherAppState.getInstance().isScreenLarge()) {
             maxCellCountX = (isLandscape ? LauncherModel.getCellCountX() :
                 LauncherModel.getCellCountY());
             maxCellCountY = (isLandscape ? LauncherModel.getCellCountY() :