diff options
| -rw-r--r-- | res/drawable-hdpi/trashcan.png | bin | 0 -> 2046 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/trashcan_hover.png | bin | 0 -> 2041 bytes | |||
| -rw-r--r-- | res/drawable-land/trash.png | bin | 1623 -> 0 bytes | |||
| -rw-r--r-- | res/drawable/delete_zone_selector.xml | 4 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 5 | ||||
| -rw-r--r-- | src/com/android/launcher2/DeleteZone.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 1 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/res/drawable-hdpi/trashcan.png b/res/drawable-hdpi/trashcan.png Binary files differnew file mode 100644 index 000000000..8d3d8e413 --- /dev/null +++ b/res/drawable-hdpi/trashcan.png diff --git a/res/drawable-hdpi/trashcan_hover.png b/res/drawable-hdpi/trashcan_hover.png Binary files differnew file mode 100644 index 000000000..59f2741d3 --- /dev/null +++ b/res/drawable-hdpi/trashcan_hover.png diff --git a/res/drawable-land/trash.png b/res/drawable-land/trash.png Binary files differdeleted file mode 100644 index dccf89151..000000000 --- a/res/drawable-land/trash.png +++ /dev/null diff --git a/res/drawable/delete_zone_selector.xml b/res/drawable/delete_zone_selector.xml index 6c917da88..0c54b1d74 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 f6f383f0a..38b5c26eb 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 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; |
