commit a9c28f6f97a4b34d9527c786e3aa8f02d92d9e07
author Joe Onorato <joeo@android.com> Mon Sep 14 18:38:49 2009 -0400
committer Joe Onorato <joeo@android.com> Mon Sep 14 18:39:04 2009 -0400
tree 4a661248e934fe259e4e78c640d8e4486459e0f7
parent 4e55c778463c11d1c9bbdaa70714d4e4b5de662c

New trash icon.

src/com/android/launcher2/DeleteZone.java

diff --git a/src/com/android/launcher2/DeleteZone.java b/src/com/android/launcher2/DeleteZone.java
index ed4cba9..ec4bc53 100644
--- a/src/com/android/launcher2/DeleteZone.java
+++ b/src/com/android/launcher2/DeleteZone.java
@@ -74,7 +74,7 @@
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        mTransition = (TransitionDrawable) getBackground();
+        mTransition = (TransitionDrawable) getDrawable();
     }
 
     public boolean acceptDrop(DragSource source, int x, int y, int xOffset, int yOffset,

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 7be2a1b..3e3ff06 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1433,6 +1433,7 @@
         }
 
         if (mWorkspace.allowLongPress()) {
+        Log.d(TAG, "there");
             mSwipeController.cancelSwipe();
             if (cellInfo.cell == null) {
                 if (cellInfo.valid) {

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 2fe4113..074fc87 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -95,7 +95,7 @@
     private int[] mTempCell = new int[2];
     private int[] mTempEstimate = new int[2];
 
-    private boolean mAllowLongPress;
+    private boolean mAllowLongPress = true;
 
     private int mTouchSlop;
     private int mMaximumVelocity;