summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2019-04-18 12:28:49 -0700
committerFelipe Leme <felipeal@google.com>2019-04-19 15:41:34 -0700
commit4e574efe28ba0e6c59e82641ee26c5cd910f96b1 (patch)
tree0a9beb5d18b680aca74b3f9cc01c068a3a9d9643 /core/java
parent24b5930f6ebd338c8d24a0a7978d09463f1e01a6 (diff)
Temporarily hide some APIs.
Test: m update-api ds-docs Test: atest CtsContentCaptureServiceTestCases Bug: 130726495 Change-Id: I3b74c1370f6b6b102e440b65c4cdf6f225296856
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/View.java45
-rw-r--r--core/java/android/view/contentcapture/ContentCaptureManager.java2
-rw-r--r--core/java/android/view/contentcapture/ContentCaptureSession.java2
-rw-r--r--core/java/android/webkit/WebView.java1
4 files changed, 39 insertions, 11 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index b1c44d6b807f..58429f44e932 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -1393,7 +1393,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @see #isImportantForContentCapture()
* @see #setImportantForContentCapture(int)
+ *
+ * @hide
*/
+ @TestApi
public static final int IMPORTANT_FOR_CONTENT_CAPTURE_AUTO = 0x0;
/**
@@ -1401,7 +1404,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @see #isImportantForContentCapture()
* @see #setImportantForContentCapture(int)
+ *
+ * @hide
*/
+ @TestApi
public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES = 0x1;
/**
@@ -1409,7 +1415,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @see #isImportantForContentCapture()
* @see #setImportantForContentCapture(int)
+ *
+ * @hide
*/
+ @TestApi
public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO = 0x2;
/**
@@ -1417,7 +1426,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @see #isImportantForContentCapture()
* @see #setImportantForContentCapture(int)
+ *
+ * @hide
*/
+ @TestApi
public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS = 0x4;
/**
@@ -1426,7 +1438,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @see #isImportantForContentCapture()
* @see #setImportantForContentCapture(int)
+ *
+ * @hide
*/
+ @TestApi
public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS = 0x8;
@@ -8585,7 +8600,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* <li>{@link ViewStructure#setTransformation(Matrix)}
*
* </ul>
+ *
+ * @hide
*/
+ @TestApi
public void onProvideContentCaptureStructure(@NonNull ViewStructure structure, int flags) {
onProvideStructure(structure, VIEW_STRUCTURE_FOR_CONTENT_CAPTURE, flags);
}
@@ -9236,6 +9254,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* {@link #setImportantForContentCapture(int)}.
*
* @attr ref android.R.styleable#View_importantForContentCapture
+ *
+ * @hide
*/
@ViewDebug.ExportedProperty(mapping = {
@ViewDebug.IntToString(from = IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, to = "auto"),
@@ -9245,15 +9265,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
to = "yesExcludeDescendants"),
@ViewDebug.IntToString(from = IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS,
to = "noExcludeDescendants")})
- @InspectableProperty(enumMapping = {
- @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, name = "auto"),
- @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_YES, name = "yes"),
- @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_NO, name = "no"),
- @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS,
- name = "yesExcludeDescendants"),
- @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS,
- name = "noExcludeDescendants"),
- })
+// @InspectableProperty(enumMapping = {
+// @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, name = "auto"),
+// @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_YES, name = "yes"),
+// @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_NO, name = "no"),
+// @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS,
+// name = "yesExcludeDescendants"),
+// @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS,
+// name = "noExcludeDescendants"),
+// })
+ @TestApi
public @ContentCaptureImportance int getImportantForContentCapture() {
// NOTE: the important for content capture values were the first flags added and are set in
// the rightmost position, so we don't need to shift them
@@ -9273,7 +9294,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* or {@link #IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS}.
*
* @attr ref android.R.styleable#View_importantForContentCapture
+ *
+ * @hide
*/
+ @TestApi
public void setImportantForContentCapture(@ContentCaptureImportance int mode) {
// Reset first
mPrivateFlags4 &= ~PFLAG4_IMPORTANT_FOR_CONTENT_CAPTURE_MASK;
@@ -9298,7 +9322,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @see #IMPORTANT_FOR_CONTENT_CAPTURE_NO
* @see #IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS
* @see #IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS
+ *
+ * @hide
*/
+ @TestApi
public final boolean isImportantForContentCapture() {
boolean isImportant;
if ((mPrivateFlags4 & PFLAG4_CONTENT_CAPTURE_IMPORTANCE_IS_CACHED) != 0) {
diff --git a/core/java/android/view/contentcapture/ContentCaptureManager.java b/core/java/android/view/contentcapture/ContentCaptureManager.java
index 1c8288e42ae5..cbe433aa1ac6 100644
--- a/core/java/android/view/contentcapture/ContentCaptureManager.java
+++ b/core/java/android/view/contentcapture/ContentCaptureManager.java
@@ -192,7 +192,7 @@ import java.util.Set;
* <p>If your view provides its own virtual hierarchy (for example, if it's a browser that draws
* the HTML using {@link Canvas} or native libraries in a different render process), then the view
* is also responsible to notify the session when the virtual elements appear and disappear - see
- * {@link View#onProvideContentCaptureStructure(ViewStructure, int)} for more info.
+ * {@code View#onProvideContentCaptureStructure(ViewStructure, int)} for more info.
*/
@SystemService(Context.CONTENT_CAPTURE_MANAGER_SERVICE)
public final class ContentCaptureManager {
diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java
index 7761038f8af1..abb570318e68 100644
--- a/core/java/android/view/contentcapture/ContentCaptureSession.java
+++ b/core/java/android/view/contentcapture/ContentCaptureSession.java
@@ -358,7 +358,7 @@ public abstract class ContentCaptureSession implements AutoCloseable {
*
* <p>Typically called "manually" by views that handle their own virtual view hierarchy, or
* automatically by the Android System for views that return {@code true} on
- * {@link View#onProvideContentCaptureStructure(ViewStructure, int)}.
+ * {@code View#onProvideContentCaptureStructure(ViewStructure, int)}.
*
* @param node node that has been added.
*/
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 26dba45666fc..9dc66d77ea44 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2798,6 +2798,7 @@ public class WebView extends AbsoluteLayout
mProvider.getViewDelegate().onProvideAutofillVirtualStructure(structure, flags);
}
+ /** @hide */
@Override
public void onProvideContentCaptureStructure(ViewStructure structure, int flags) {
mProvider.getViewDelegate().onProvideContentCaptureStructure(structure, flags);