New trash icon.
diff --git a/res/drawable-hdpi/trashcan.png b/res/drawable-hdpi/trashcan.png
new file mode 100644
index 0000000..8d3d8e4
--- /dev/null
+++ b/res/drawable-hdpi/trashcan.png
Binary files differ
diff --git a/res/drawable-hdpi/trashcan_hover.png b/res/drawable-hdpi/trashcan_hover.png
new file mode 100644
index 0000000..59f2741
--- /dev/null
+++ b/res/drawable-hdpi/trashcan_hover.png
Binary files differ
diff --git a/res/drawable-land/trash.png b/res/drawable-land/trash.png
deleted file mode 100644
index dccf891..0000000
--- a/res/drawable-land/trash.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/delete_zone_selector.xml b/res/drawable/delete_zone_selector.xml
index 6c917da..0c54b1d7 100644
--- a/res/drawable/delete_zone_selector.xml
+++ b/res/drawable/delete_zone_selector.xml
@@ -19,6 +19,6 @@
-->
<transition xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/delete_handle_normal" />
- <item android:drawable="@drawable/delete_handle" />
+ <item android:drawable="@drawable/trashcan" />
+ <item android:drawable="@drawable/trashcan_hover" />
</transition>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index f6f383f..38b5c26 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -63,13 +63,12 @@
<com.android.launcher2.DeleteZone
android:id="@+id/delete_zone"
- android:layout_width="wrap_content"
+ android:layout_width="fill_parent"
android:layout_height="49dip"
android:layout_gravity="bottom|center_horizontal"
android:scaleType="center"
- android:src="@drawable/ic_delete"
- android:background="@drawable/delete_zone_selector"
+ android:src="@drawable/delete_zone_selector"
android:visibility="invisible"
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,
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) {
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;
