Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bad Java docs in View.java" into oc-dev

Browse Source 
am: 94696c5ac5

Change-Id: If280cda4e47d42eef997a46bb83ca9e1ff31aa6a
This commit is contained in:
Philip P. Moltmann
2017-03-29 18:39:32 +00:00
committed by android-build-merger
parent d580a85b20 94696c5ac5
commit a81040a335
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/view/View.java
View File

@@ -61,6 +61,7 @@ import android.graphics.Shader;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.hardware.display.DisplayManagerGlobal;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -4170,14 +4171,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/**
* When this flag is used with {@link #DRAG_FLAG_GLOBAL}, the drag recipient will be able to
* request read access to the content URI(s) contained in the {@link ClipData} object.
* @see android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION
* @see android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION
*/
public static final int DRAG_FLAG_GLOBAL_URI_READ = Intent.FLAG_GRANT_READ_URI_PERMISSION;
/**
* When this flag is used with {@link #DRAG_FLAG_GLOBAL}, the drag recipient will be able to
* request write access to the content URI(s) contained in the {@link ClipData} object.
* @see android.content.Intent.FLAG_GRANT_WRITE_URI_PERMISSION
* @see android.content.Intent#FLAG_GRANT_WRITE_URI_PERMISSION
*/
public static final int DRAG_FLAG_GLOBAL_URI_WRITE = Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
@@ -4185,8 +4186,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* When this flag is used with {@link #DRAG_FLAG_GLOBAL_URI_READ} and/or {@link
* #DRAG_FLAG_GLOBAL_URI_WRITE}, the URI permission grant can be persisted across device
* reboots until explicitly revoked with
* {@link android.content.Context#revokeUriPermission(Uri,int) Context.revokeUriPermission}.
* @see android.content.Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
* {@link android.content.Context#revokeUriPermission(Uri, int)} Context.revokeUriPermission}.
* @see android.content.Intent#FLAG_GRANT_PERSISTABLE_URI_PERMISSION
*/
public static final int DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION =
Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION;
@@ -4195,7 +4196,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* When this flag is used with {@link #DRAG_FLAG_GLOBAL_URI_READ} and/or {@link
* #DRAG_FLAG_GLOBAL_URI_WRITE}, the URI permission grant applies to any URI that is a prefix
* match against the original granted URI.
* @see android.content.Intent.FLAG_GRANT_PREFIX_URI_PERMISSION
* @see android.content.Intent#FLAG_GRANT_PREFIX_URI_PERMISSION
*/
public static final int DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION =
Intent.FLAG_GRANT_PREFIX_URI_PERMISSION;
@@ -7895,7 +7896,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @param arguments A {@link Bundle} holding any arguments relevant for this request. May be
* {@code null} if the service provided no arguments.
*
* @see AccessibilityNodeInfo#setExtraAvailableData
* @see AccessibilityNodeInfo#setAvailableExtraData(List)
*/
public void addExtraDataToAccessibilityNodeInfo(
@NonNull AccessibilityNodeInfo info, @NonNull String extraDataKey,
@@ -9839,7 +9840,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* Focus gets restored for a view hierarchy when the root of the hierarchy gets added to a
* window or serves as a target of cluster navigation.
*
* @see #restoreDefaultFocus(int)
* @see #restoreDefaultFocus()
*
* @return {@code true} if this view is the default-focus view, {@code false} otherwise
* @attr ref android.R.styleable#View_focusedByDefault
@@ -9859,7 +9860,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @param isFocusedByDefault {@code true} to set this view as the default-focus view,
* {@code false} otherwise.
*
* @see #restoreDefaultFocus(int)
* @see #restoreDefaultFocus()
*
* @attr ref android.R.styleable#View_focusedByDefault
*/