diff options
author | Joe Onorato <joeo@android.com> | 2009-09-14 18:38:49 -0400 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2009-09-14 18:39:04 -0400 |
commit | a9c28f6f97a4b34d9527c786e3aa8f02d92d9e07 (patch) | |
tree | 4a661248e934fe259e4e78c640d8e4486459e0f7 /src/com | |
parent | 4e55c778463c11d1c9bbdaa70714d4e4b5de662c (diff) | |
download | android_packages_apps_Trebuchet-a9c28f6f97a4b34d9527c786e3aa8f02d92d9e07.tar.gz android_packages_apps_Trebuchet-a9c28f6f97a4b34d9527c786e3aa8f02d92d9e07.tar.bz2 android_packages_apps_Trebuchet-a9c28f6f97a4b34d9527c786e3aa8f02d92d9e07.zip |
New trash icon.
Diffstat (limited to 'src/com')
-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 |
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; |