Merge "Revert "Temporarily hide some APIs."" (863093bc) · Commits · e / os / android_frameworks_base

api/current.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -745,6 +745,7 @@ package android {
		field public static final int immersive = 16843456; // 0x10102c0
		field public static final int importantForAccessibility = 16843690; // 0x10103aa
		field public static final int importantForAutofill = 16844120; // 0x1010558
		field public static final int importantForContentCapture = 16844295; // 0x1010607
		field public static final int inAnimation = 16843127; // 0x1010177
		field public static final int includeFontPadding = 16843103; // 0x101015f
		field public static final int includeInGlobalSearch = 16843374; // 0x101026e
		@@ -50221,6 +50222,7 @@ package android.view {
		method @android.view.ViewDebug.CapturedViewProperty @IdRes public int getId();
		method @android.view.ViewDebug.ExportedProperty(category="accessibility", mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, to="noHideDescendants")}) public int getImportantForAccessibility();
		method @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS, to="yesExcludeDescendants"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS, to="noExcludeDescendants")}) public int getImportantForAutofill();
		method @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS, to="yesExcludeDescendants"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS, to="noExcludeDescendants")}) public int getImportantForContentCapture();
		method public boolean getKeepScreenOn();
		method public android.view.KeyEvent.DispatcherState getKeyDispatcherState();
		method @android.view.ViewDebug.ExportedProperty(category="accessibility") @IdRes public int getLabelFor();
		@@ -50361,6 +50363,7 @@ package android.view {
		method @android.view.ViewDebug.ExportedProperty public boolean isHovered();
		method public boolean isImportantForAccessibility();
		method public final boolean isImportantForAutofill();
		method public final boolean isImportantForContentCapture();
		method public boolean isInEditMode();
		method public boolean isInLayout();
		method @android.view.ViewDebug.ExportedProperty public boolean isInTouchMode();
		@@ -50435,6 +50438,7 @@ package android.view {
		method @CallSuper public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public void onProvideAutofillStructure(android.view.ViewStructure, int);
		method public void onProvideAutofillVirtualStructure(android.view.ViewStructure, int);
		method public void onProvideContentCaptureStructure(@NonNull android.view.ViewStructure, int);
		method public void onProvideStructure(android.view.ViewStructure);
		method public void onProvideVirtualStructure(android.view.ViewStructure);
		method public android.view.PointerIcon onResolvePointerIcon(android.view.MotionEvent, int);
		@@ -50560,6 +50564,7 @@ package android.view {
		method public void setId(@IdRes int);
		method public void setImportantForAccessibility(int);
		method public void setImportantForAutofill(int);
		method public void setImportantForContentCapture(int);
		method public void setKeepScreenOn(boolean);
		method public void setKeyboardNavigationCluster(boolean);
		method public void setLabelFor(@IdRes int);
		@@ -50738,6 +50743,11 @@ package android.view {
		field public static final int IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS = 8; // 0x8
		field public static final int IMPORTANT_FOR_AUTOFILL_YES = 1; // 0x1
		field public static final int IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS = 4; // 0x4
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_AUTO = 0; // 0x0
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO = 2; // 0x2
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS = 8; // 0x8
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES = 1; // 0x1
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS = 4; // 0x4
		field public static final int INVISIBLE = 4; // 0x4
		field public static final int KEEP_SCREEN_ON = 67108864; // 0x4000000
		field public static final int LAYER_TYPE_HARDWARE = 2; // 0x2

api/test-current.txt

+0 −9

Original line number	Diff line number	Diff line
		@@ -3171,12 +3171,9 @@ package android.view {
		}

		@UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {
		method @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS, to="yesExcludeDescendants"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS, to="noExcludeDescendants")}) public int getImportantForContentCapture();
		method public android.view.View getTooltipView();
		method public static boolean isDefaultFocusHighlightEnabled();
		method public boolean isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
		method public final boolean isImportantForContentCapture();
		method public void onProvideContentCaptureStructure(@NonNull android.view.ViewStructure, int);
		method protected void resetResolvedDrawables();
		method public void resetResolvedLayoutDirection();
		method public void resetResolvedPadding();
		@@ -3187,13 +3184,7 @@ package android.view {
		method public boolean restoreFocusNotInCluster();
		method public void setAutofilled(boolean);
		method public final void setFocusedInCluster();
		method public void setImportantForContentCapture(int);
		method public void setIsRootNamespace(boolean);
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_AUTO = 0; // 0x0
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO = 2; // 0x2
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS = 8; // 0x8
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES = 1; // 0x1
		field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS = 4; // 0x4
		}

		public class ViewConfiguration {

core/java/android/view/View.java

+9 −36

Original line number	Diff line number	Diff line
		@@ -1393,10 +1393,7 @@ 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;

		/**
		@@ -1404,10 +1401,7 @@ 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;

		/**
		@@ -1415,10 +1409,7 @@ 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;

		/**
		@@ -1426,10 +1417,7 @@ 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;

		/**
		@@ -1438,10 +1426,7 @@ 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;


		@@ -8602,10 +8587,7 @@ 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);
		}
		@@ -9256,8 +9238,6 @@ 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"),
		@@ -9267,16 +9247,15 @@ 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"),
		// })
		@TestApi
		@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"),
		})
		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
		@@ -9296,10 +9275,7 @@ 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;
		@@ -9324,10 +9300,7 @@ 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) {

core/java/android/view/contentcapture/ContentCaptureManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -193,7 +193,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
		* {@code View#onProvideContentCaptureStructure(ViewStructure, int)} for more info.
		* {@link View#onProvideContentCaptureStructure(ViewStructure, int)} for more info.
		*/
		@SystemService(Context.CONTENT_CAPTURE_MANAGER_SERVICE)
		public final class ContentCaptureManager {

core/java/android/view/contentcapture/ContentCaptureSession.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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
		* {@code View#onProvideContentCaptureStructure(ViewStructure, int)}.
		* {@link View#onProvideContentCaptureStructure(ViewStructure, int)}.
		*
		* @param node node that has been added.
		*/