summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher2/DeleteZone.java2
-rw-r--r--src/com/android/launcher2/Launcher.java1
-rw-r--r--src/com/android/launcher2/Workspace.java2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher2/DeleteZone.java b/src/com/android/launcher2/DeleteZone.java
index ed4cba931..ec4bc534c 100644
--- a/src/com/android/launcher2/DeleteZone.java
+++ b/src/com/android/launcher2/DeleteZone.java
@@ -74,7 +74,7 @@ public class DeleteZone extends ImageView implements DropTarget, DragController.
@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,
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 7be2a1bcc..3e3ff0615 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1433,6 +1433,7 @@ public final class Launcher extends Activity
}
if (mWorkspace.allowLongPress()) {
+ Log.d(TAG, "there");
mSwipeController.cancelSwipe();
if (cellInfo.cell == null) {
if (cellInfo.valid) {
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 2fe41133c..074fc8705 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -95,7 +95,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
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;