Merge "Add new TYPE_WINDOW_CONTROL API to AccessibilityWindowInfo" into main (531fb673) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -55250,6 +55250,7 @@ package android.view.accessibility {
	field public static final int TYPE_MAGNIFICATION_OVERLAY = 6; // 0x6		field public static final int TYPE_MAGNIFICATION_OVERLAY = 6; // 0x6
	field public static final int TYPE_SPLIT_SCREEN_DIVIDER = 5; // 0x5		field public static final int TYPE_SPLIT_SCREEN_DIVIDER = 5; // 0x5
	field public static final int TYPE_SYSTEM = 3; // 0x3		field public static final int TYPE_SYSTEM = 3; // 0x3
			field @FlaggedApi("android.view.accessibility.add_type_window_control") public static final int TYPE_WINDOW_CONTROL = 7; // 0x7
	}		}

	public class CaptioningManager {		public class CaptioningManager {

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.view.accessibility;		package android.view.accessibility;

			import android.annotation.FlaggedApi;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.TestApi;		import android.annotation.TestApi;
	@@ -93,6 +94,12 @@ public final class AccessibilityWindowInfo implements Parcelable {
	*/		*/
	public static final int TYPE_MAGNIFICATION_OVERLAY = 6;		public static final int TYPE_MAGNIFICATION_OVERLAY = 6;

			/**
			* Window type: A system window that has the function to control an associated window.
			*/
			@FlaggedApi(Flags.FLAG_ADD_TYPE_WINDOW_CONTROL)
			public static final int TYPE_WINDOW_CONTROL = 7;

	/* Special values for window IDs */		/* Special values for window IDs */
	/** @hide */		/** @hide */
	public static final int ACTIVE_WINDOW_ID = Integer.MAX_VALUE;		public static final int ACTIVE_WINDOW_ID = Integer.MAX_VALUE;
	@@ -873,6 +880,10 @@ public final class AccessibilityWindowInfo implements Parcelable {
	* @hide		* @hide
	*/		*/
	public static String typeToString(int type) {		public static String typeToString(int type) {
			if (Flags.addTypeWindowControl() && type == TYPE_WINDOW_CONTROL) {
			return "TYPE_WINDOW_CONTROL";
			}

	switch (type) {		switch (type) {
	case TYPE_APPLICATION: {		case TYPE_APPLICATION: {
	return "TYPE_APPLICATION";		return "TYPE_APPLICATION";

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -100,6 +100,13 @@ flag {
	bug: "303511250"		bug: "303511250"
	}		}

			flag {
			namespace: "accessibility"
			name: "add_type_window_control"
			description: "adds new TYPE_WINDOW_CONTROL to AccessibilityWindowInfo for detecting Window Decorations"
			bug: "320445550"
			}

	flag {		flag {
	namespace: "accessibility"		namespace: "accessibility"
	name: "update_always_on_a11y_service"		name: "update_always_on_a11y_service"