Merge "Fix docs for DragEvent" into nyc-dev

This commit is contained in:
TreeHugger Robot
2016-07-11 23:17:40 +00:00
committed by Android (Google) Code Review

View File

@@ -102,8 +102,8 @@ import com.android.internal.view.IDragAndDropPermissions;
* </tr> * </tr>
* <tr> * <tr>
* <td>ACTION_DRAG_ENDED</td> * <td>ACTION_DRAG_ENDED</td>
* <td style="text-align: center;">X</td> * <td style="text-align: center;">&nbsp;</td>
* <td style="text-align: center;">X</td> * <td style="text-align: center;">&nbsp;</td>
* <td style="text-align: center;">&nbsp;</td> * <td style="text-align: center;">&nbsp;</td>
* <td style="text-align: center;">&nbsp;</td> * <td style="text-align: center;">&nbsp;</td>
* <td style="text-align: center;">&nbsp;</td> * <td style="text-align: center;">&nbsp;</td>
@@ -359,7 +359,7 @@ public class DragEvent implements Parcelable {
* The drag handler or listener for a View can use the metadata in this object to decide if the * The drag handler or listener for a View can use the metadata in this object to decide if the
* View can accept the dragged View object's data. * View can accept the dragged View object's data.
* <p> * <p>
* This method returns valid data for all event actions. * This method returns valid data for all event actions except for {@link #ACTION_DRAG_ENDED}.
* @return The ClipDescription that was part of the ClipData sent to the system by startDrag(). * @return The ClipDescription that was part of the ClipData sent to the system by startDrag().
*/ */
public ClipDescription getClipDescription() { public ClipDescription getClipDescription() {
@@ -377,7 +377,7 @@ public class DragEvent implements Parcelable {
* The object is intended to provide local information about the drag and drop operation. For * The object is intended to provide local information about the drag and drop operation. For
* example, it can indicate whether the drag and drop operation is a copy or a move. * example, it can indicate whether the drag and drop operation is a copy or a move.
* <p> * <p>
* This method returns valid data for all event actions. * This method returns valid data for all event actions except for {@link #ACTION_DRAG_ENDED}.
* </p> * </p>
* @return The local state object sent to the system by startDrag(). * @return The local state object sent to the system by startDrag().
*/ */