diff options
| author | Anjali Koppal <akoppal@google.com> | 2014-03-17 23:22:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-17 23:22:58 +0000 |
| commit | af63581cb6e6db0e58e292905b69b7a04383211f (patch) | |
| tree | 057e003afc6871800cacae74a00f2dc08b02cd12 /src | |
| parent | 8c10ce7f82f2391ca446595038e9ec0061334b91 (diff) | |
| parent | 62d18edcc74ce96e2955048f5e0fc0ce3e4ec275 (diff) | |
| download | android_packages_apps_Trebuchet-af63581cb6e6db0e58e292905b69b7a04383211f.tar.gz android_packages_apps_Trebuchet-af63581cb6e6db0e58e292905b69b7a04383211f.tar.bz2 android_packages_apps_Trebuchet-af63581cb6e6db0e58e292905b69b7a04383211f.zip | |
Merge "Add Launcher.onDragStarted" into ub-now-mister-ugly
Diffstat (limited to 'src')
| -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); |