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/DragLayer.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/DragLayer.java')
-rw-r--r-- | src/com/android/launcher3/DragLayer.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 3bf54e859..b02f803d6 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -34,14 +34,11 @@ import android.view.ViewGroup; import android.view.ViewParent; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; -import android.view.accessibility.AccessibilityNodeInfo; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.TextView; -import com.android.launcher3.R; - import java.util.ArrayList; /** @@ -779,7 +776,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang protected void dispatchDraw(Canvas canvas) { super.dispatchDraw(canvas); - if (mInScrollArea && !LauncherAppState.isScreenLarge()) { + if (mInScrollArea && !LauncherAppState.getInstance().isScreenLarge()) { Workspace workspace = mLauncher.getWorkspace(); int width = workspace.getWidth(); Rect childRect = new Rect(); |