diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-06-25 15:13:26 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2013-06-27 15:17:11 -0400 |
| commit | e4f9891f01bdc10d8f96e4e2429e2f4d0558238b (patch) | |
| tree | 3de05f7433f52bfcade535ab4aa5176675588d56 /src/com/android/launcher3/Cling.java | |
| parent | fe7750b5d6cb76a3aa7b1b479e4cc243653fa0c1 (diff) | |
| download | android_packages_apps_Trebuchet-e4f9891f01bdc10d8f96e4e2429e2f4d0558238b.tar.gz android_packages_apps_Trebuchet-e4f9891f01bdc10d8f96e4e2429e2f4d0558238b.tar.bz2 android_packages_apps_Trebuchet-e4f9891f01bdc10d8f96e4e2429e2f4d0558238b.zip | |
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
Diffstat (limited to 'src/com/android/launcher3/Cling.java')
| -rw-r--r-- | src/com/android/launcher3/Cling.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Cling.java b/src/com/android/launcher3/Cling.java index 9326e38a2..77c41b799 100644 --- a/src/com/android/launcher3/Cling.java +++ b/src/com/android/launcher3/Cling.java @@ -33,8 +33,6 @@ import android.view.MotionEvent; 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 @@ public class Cling extends FrameLayout { } 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}; |