diff options
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 4 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/drag-drop.jd | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 1b3f6ffe2b64..2e428a734331 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -20,6 +20,7 @@ import android.animation.LayoutTransition; import android.annotation.IdRes; import android.annotation.NonNull; import android.annotation.UiThread; +import android.content.ClipData; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -1380,6 +1381,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager boolean retval = false; final float tx = event.mX; final float ty = event.mY; + final ClipData td = event.mClipData; // Dispatch down the view hierarchy final PointF localPoint = getLocalPoint(); @@ -1465,6 +1467,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager // ACTION_DRAG_EXITED. event.mX = 0; event.mY = 0; + event.mClipData = null; if (mCurrentDragChild != null) { event.mAction = DragEvent.ACTION_DRAG_EXITED; @@ -1479,6 +1482,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager event.mAction = action; event.mX = tx; event.mY = ty; + event.mClipData = td; } mCurrentDragChild = target; } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index ec29abfe4253..745a82bd7b74 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -29,6 +29,7 @@ import android.animation.LayoutTransition; import android.annotation.NonNull; import android.app.ActivityManagerNative; import android.app.ResourcesManager; +import android.content.ClipData; import android.content.ClipDescription; import android.content.ComponentCallbacks; import android.content.Context; @@ -5657,9 +5658,11 @@ public final class ViewRootImpl implements ViewParent, final float tx = event.mX; final float ty = event.mY; final int action = event.mAction; + final ClipData td = event.mClipData; // Position should not be available for ACTION_DRAG_ENTERED and ACTION_DRAG_EXITED. event.mX = 0; event.mY = 0; + event.mClipData = null; if (mCurrentDragView != null) { event.mAction = DragEvent.ACTION_DRAG_EXITED; @@ -5674,6 +5677,7 @@ public final class ViewRootImpl implements ViewParent, event.mAction = action; event.mX = tx; event.mY = ty; + event.mClipData = td; } mCurrentDragView = newDragTarget; diff --git a/docs/html/guide/topics/ui/drag-drop.jd b/docs/html/guide/topics/ui/drag-drop.jd index 8e4297f8ce1b..d6e07a56f60d 100644 --- a/docs/html/guide/topics/ui/drag-drop.jd +++ b/docs/html/guide/topics/ui/drag-drop.jd @@ -408,8 +408,8 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm <td>{@link android.view.DragEvent#ACTION_DRAG_ENTERED}</td> <td style="text-align: center;">X</td> <td style="text-align: center;">X</td> - <td style="text-align: center;">X</td> - <td style="text-align: center;">X</td> + <td style="text-align: center;"> </td> + <td style="text-align: center;"> </td> <td style="text-align: center;"> </td> <td style="text-align: center;"> </td> </tr> @@ -442,7 +442,7 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm </tr> <tr> <td>{@link android.view.DragEvent#ACTION_DRAG_ENDED}</td> - <td style="text-align: center;">X</td> + <td style="text-align: center;"> </td> <td style="text-align: center;">X</td> <td style="text-align: center;"> </td> <td style="text-align: center;"> </td> |