diff options
| author | 2016-09-09 18:34:55 +0000 | |
|---|---|---|
| committer | 2016-09-09 18:34:59 +0000 | |
| commit | 148ccbb082951addb78773bc70fea2589334868c (patch) | |
| tree | afdeaaf642ff425cf5875179fa6024987db51bd4 | |
| parent | 19ebec6d36d3f3c3cd674c31db43bfa6b7956d15 (diff) | |
| parent | 048f3bfaf0c4b03880706eec88e66d5d2c704c1e (diff) | |
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev
| -rw-r--r-- | core/java/android/view/DragEvent.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/view/DragEvent.java b/core/java/android/view/DragEvent.java index b0f15b5f2329..a394f351b7f3 100644 --- a/core/java/android/view/DragEvent.java +++ b/core/java/android/view/DragEvent.java @@ -377,6 +377,10 @@ public class DragEvent implements Parcelable { * 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. * <p> + * The local state is available only to views in the activity which has started the drag + * operation. In all other activities this method will return null + * </p> + * <p> * This method returns valid data for all event actions except for {@link #ACTION_DRAG_ENDED}. * </p> * @return The local state object sent to the system by startDrag(). diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 22091c7a70ef..47cffac75593 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -20524,8 +20524,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @param shadowBuilder A {@link android.view.View.DragShadowBuilder} object for building the * drag shadow. * @param myLocalState An {@link java.lang.Object} containing local data about the drag and - * drop operation. This Object is put into every DragEvent object sent by the system during the - * current drag. + * drop operation. When dispatching drag events to views in the same activity this object + * will be available through {@link android.view.DragEvent#getLocalState()}. Views in other + * activities will not have access to this data ({@link android.view.DragEvent#getLocalState()} + * will return null). * <p> * myLocalState is a lightweight mechanism for the sending information from the dragged View * to the target Views. For example, it can contain flags that differentiate between a |