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

diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 0ccdae1..4be9b81 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -34,8 +34,6 @@
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LinearInterpolator;
 
-import com.android.launcher3.R;
-
 public class DeleteDropTarget extends ButtonDropTarget {
     private static int DELETE_ANIMATION_DURATION = 285;
     private static int FLING_DELETE_ANIMATION_DURATION = 350;
@@ -82,7 +80,7 @@
         // Remove the text in the Phone UI in landscape
         int orientation = getResources().getConfiguration().orientation;
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            if (!LauncherAppState.isScreenLarge()) {
+            if (!LauncherAppState.getInstance().isScreenLarge()) {
                 setText("");
             }
         }