summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Hufnagle <khufnagle@google.com> 2019-09-30 09:29:21 -0700
committer android-build-merger <android-build-merger@google.com> 2019-09-30 09:29:21 -0700
commitdc0d6668ff8c46cb6e90f61b46208adca88ab189 (patch)
tree53ff914040dd0b60dcae3cae24dad25d1178d924
parent4638ea10e2dffa9b68d310ba0bd9502cc53d1648 (diff)
parent52145e2481cffccd3337436e5c2f787dca4d6981 (diff)
Merge "docs: Added link to multi-window drag how-to guide" into qt-dev am: 667b944522
am: 52145e2481 Change-Id: Ib486bb5a6a03151e4116f9acf330aa68bf24c583
-rw-r--r--core/java/android/view/DragAndDropPermissions.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/view/DragAndDropPermissions.java b/core/java/android/view/DragAndDropPermissions.java
index e72ff38ce3f0..d47604d6ec41 100644
--- a/core/java/android/view/DragAndDropPermissions.java
+++ b/core/java/android/view/DragAndDropPermissions.java
@@ -37,7 +37,7 @@ import com.android.internal.view.IDragAndDropPermissions;
* View.startDragAndDrop} by the app that started the drag operation.
* </p>
* <p>
- * The life cycle of the permissions is bound to the activity used to call {@link
+ * The lifecycle of the permissions is bound to the activity used to call {@link
* android.app.Activity#requestDragAndDropPermissions(DragEvent) requestDragAndDropPermissions}. The
* permissions are revoked when this activity is destroyed, or when {@link #release()} is called,
* whichever occurs first.
@@ -49,6 +49,10 @@ import com.android.internal.view.IDragAndDropPermissions;
* {@link Activity#onSaveInstanceState} bundle and later retrieved in order to manually release
* the permissions once they are no longer needed.
* </p>
+ * <p>
+ * Learn more about <a href="/guide/topics/ui/drag-drop#DragPermissionsMultiWindow">drag permissions
+ * in multi-window mode</a>.
+ * </p>
*/
public final class DragAndDropPermissions implements Parcelable {