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

diff --git a/src/com/android/launcher3/Cling.java b/src/com/android/launcher3/Cling.java
index 9326e38..77c41b7 100644
--- a/src/com/android/launcher3/Cling.java
+++ b/src/com/android/launcher3/Cling.java
@@ -33,8 +33,6 @@
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.launcher3.R;
-
 public class Cling extends FrameLayout {
 
     static final String WORKSPACE_CLING_DISMISSED_KEY = "cling.workspace.dismissed";
@@ -126,7 +124,7 @@
         } else if (mDrawIdentifier.equals(WORKSPACE_LANDSCAPE)) {
             return new int[]{getMeasuredWidth() - (mButtonBarHeight / 2), getMeasuredHeight() / 2};
         } else if (mDrawIdentifier.equals(WORKSPACE_LARGE)) {
-            final float scale = LauncherAppState.getScreenDensity();
+            final float scale = LauncherAppState.getInstance().getScreenDensity();
             final int cornerXOffset = (int) (scale * 15);
             final int cornerYOffset = (int) (scale * 10);
             return new int[]{getMeasuredWidth() - cornerXOffset, cornerYOffset};