diff options
author | Anjali Koppal <akoppal@google.com> | 2014-03-17 23:27:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-17 23:27:02 +0000 |
commit | 47541ad2d21b49a59011b2d9caf9e4c2d79792f0 (patch) | |
tree | 057e003afc6871800cacae74a00f2dc08b02cd12 | |
parent | a57b35a767afdebae6dd1802e527ddae0994c6c2 (diff) | |
parent | af63581cb6e6db0e58e292905b69b7a04383211f (diff) | |
download | android_packages_apps_Trebuchet-47541ad2d21b49a59011b2d9caf9e4c2d79792f0.tar.gz android_packages_apps_Trebuchet-47541ad2d21b49a59011b2d9caf9e4c2d79792f0.tar.bz2 android_packages_apps_Trebuchet-47541ad2d21b49a59011b2d9caf9e4c2d79792f0.zip |
am af63581c: Merge "Add Launcher.onDragStarted" into ub-now-mister-ugly
* commit 'af63581cb6e6db0e58e292905b69b7a04383211f':
Add Launcher.onDragStarted
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f1ce23524..c18574ad5 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2596,6 +2596,8 @@ public class Launcher extends Activity } } + public void onDragStarted(View view) {} + /** * Called when the user stops interacting with the launcher. * This implies that the user is now on the homescreen and is not doing housekeeping. diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index a22b02508..1732e37fb 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2598,6 +2598,7 @@ public class Workspace extends SmoothPagedView } public void beginDragShared(View child, DragSource source) { + mLauncher.onDragStarted(child); // The drag bitmap follows the touch point around on the screen final Bitmap b = createDragBitmap(child, new Canvas(), DRAG_BITMAP_PADDING); |