diff options
author | Adam Cohen <adamcohen@google.com> | 2011-06-01 15:30:43 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-06-08 15:21:29 -0700 |
commit | c0dcf597084d00e4c23a7fea5fd0738f6c095a6b (patch) | |
tree | 9dcecb4d43b4abc0263d47300536e87a72e33c58 /src/com/android/launcher2/DragController.java | |
parent | 9578bde6a903925fbda2ecf738c7b00d6fa4026d (diff) | |
download | packages_apps_trebuchet-c0dcf597084d00e4c23a7fea5fd0738f6c095a6b.zip packages_apps_trebuchet-c0dcf597084d00e4c23a7fea5fd0738f6c095a6b.tar.gz packages_apps_trebuchet-c0dcf597084d00e4c23a7fea5fd0738f6c095a6b.tar.bz2 |
Fixing up some Folder bugs
-> Rendering properly while in spring-loaded mode
-> Fixed bug where sometimes the folder's background would vanish
-> Fixed bug where the folder background was "stuck" in a fixed
location, not following the folder
-> Can now add to folders and create folders from spring-loaded mode
Change-Id: Ie1c5583a6230a192e6d07763d001b50053daca43
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
-rw-r--r-- | src/com/android/launcher2/DragController.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index 1690cac..8ad5c7c 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -16,8 +16,6 @@ package com.android.launcher2; -import java.util.ArrayList; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.Rect; @@ -35,7 +33,8 @@ import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import com.android.launcher.R; -import com.android.launcher2.DropTarget.DragObject; + +import java.util.ArrayList; /** * Class for initiating a drag within a view or across multiple views. @@ -374,7 +373,7 @@ public class DragController { public void cancelDrag() { if (mDragging) { // Should we also be calling onDragExit() here? - mDragObject.dragSource.onDropCompleted(null, mDragObject.dragInfo, false); + mDragObject.dragSource.onDropCompleted(null, mDragObject, false); } endDrag(); } @@ -572,8 +571,7 @@ public class DragController { accepted = true; } } - mDragObject.dragSource.onDropCompleted((View) dropTarget, mDragObject.dragInfo, accepted); - + mDragObject.dragSource.onDropCompleted((View) dropTarget, mDragObject, accepted); } private DropTarget findDropTarget(int x, int y, int[] dropCoordinates) { |