Merge "Added moar ContentCapture APIs (and their initial implementation)." (1eec9517) · Commits · e / os / android_frameworks_base

api/current.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -740,6 +740,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 = 16844182; // 0x1010596
		field public static final int inAnimation = 16843127; // 0x1010177
		field public static final int includeFontPadding = 16843103; // 0x101015f
		field public static final int includeInGlobalSearch = 16843374; // 0x101026e
		@@ -48843,6 +48844,7 @@ package android.view {
		method public int getId();
		method public int getImportantForAccessibility();
		method public int getImportantForAutofill();
		method public int getImportantForContentCapture();
		method public boolean getKeepScreenOn();
		method public android.view.KeyEvent.DispatcherState getKeyDispatcherState();
		method public int getLabelFor();
		@@ -48976,6 +48978,7 @@ package android.view {
		method 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 public boolean isInTouchMode();
		@@ -49050,6 +49053,7 @@ package android.view {
		method 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 boolean onProvideContentCaptureStructure(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);
		@@ -49168,6 +49172,7 @@ package android.view {
		method public void setId(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(int);
		@@ -49338,6 +49343,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
		@@ -51792,6 +51802,10 @@ package android.view.intelligence {
		method public void disableContentCapture();
		method public android.content.ComponentName getIntelligenceServiceComponentName();
		method public boolean isContentCaptureEnabled();
		method public android.view.ViewStructure newVirtualViewStructure(android.view.autofill.AutofillId, int);
		method public void notifyViewAppeared(android.view.ViewStructure);
		method public void notifyViewDisappeared(android.view.autofill.AutofillId);
		method public void notifyViewTextChanged(android.view.autofill.AutofillId, java.lang.CharSequence, int);
		field public static final int FLAG_USER_INPUT = 1; // 0x1
		}

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -7005,8 +7005,8 @@ package android.view.intelligence {
		field public static final int TYPE_ACTIVITY_RESUMED = 2; // 0x2
		field public static final int TYPE_ACTIVITY_STARTED = 1; // 0x1
		field public static final int TYPE_ACTIVITY_STOPPED = 4; // 0x4
		field public static final int TYPE_VIEW_ADDED = 5; // 0x5
		field public static final int TYPE_VIEW_REMOVED = 6; // 0x6
		field public static final int TYPE_VIEW_APPEARED = 5; // 0x5
		field public static final int TYPE_VIEW_DISAPPEARED = 6; // 0x6
		field public static final int TYPE_VIEW_TEXT_CHANGED = 7; // 0x7
		}

api/test-current.txt

+3 −3

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

		public abstract interface WindowManager implements android.view.ViewManager {
		method public abstract void setShouldShowIme(int, boolean);
		method public abstract void setShouldShowWithInsecureKeyguard(int, boolean);
		method public abstract void setShouldShowSystemDecors(int, boolean);
		method public default void setShouldShowIme(int, boolean);
		method public default void setShouldShowSystemDecors(int, boolean);
		method public default void setShouldShowWithInsecureKeyguard(int, boolean);
		}

		public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {

core/java/android/view/View.java

+415 −14

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/ViewStructure.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.os.Bundle;
		import android.os.LocaleList;
		import android.util.Pair;
		import android.view.View.AutofillImportance;
		import android.view.ViewStructure.HtmlInfo;
		import android.view.autofill.AutofillId;
		import android.view.autofill.AutofillValue;