Merge "Added flags for new A11y APIs for scroll amount and collection counts" into main (ee51e62c) · Commits · e / os / android_frameworks_base

core/api/current.txt

+17 −18

Original line number	Diff line number	Diff line
		@@ -54187,7 +54187,7 @@ package android.view.accessibility {
		method public boolean isEnabled();
		method public boolean isFocusable();
		method public boolean isFocused();
		method public boolean isGranularScrollingSupported();
		method @FlaggedApi("android.view.accessibility.granular_scrolling") public boolean isGranularScrollingSupported();
		method public boolean isHeading();
		method public boolean isImportantForAccessibility();
		method public boolean isLongClickable();
		@@ -54237,7 +54237,7 @@ package android.view.accessibility {
		method public void setError(CharSequence);
		method public void setFocusable(boolean);
		method public void setFocused(boolean);
		method public void setGranularScrollingSupported(boolean);
		method @FlaggedApi("android.view.accessibility.granular_scrolling") public void setGranularScrollingSupported(boolean);
		method public void setHeading(boolean);
		method public void setHintText(CharSequence);
		method public void setImportantForAccessibility(boolean);
		@@ -54292,7 +54292,7 @@ package android.view.accessibility {
		field public static final String ACTION_ARGUMENT_PRESS_AND_HOLD_DURATION_MILLIS_INT = "android.view.accessibility.action.ARGUMENT_PRESS_AND_HOLD_DURATION_MILLIS_INT";
		field public static final String ACTION_ARGUMENT_PROGRESS_VALUE = "android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE";
		field public static final String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT";
		field public static final String ACTION_ARGUMENT_SCROLL_AMOUNT_FLOAT = "android.view.accessibility.action.ARGUMENT_SCROLL_AMOUNT_FLOAT";
		field @FlaggedApi("android.view.accessibility.granular_scrolling") public static final String ACTION_ARGUMENT_SCROLL_AMOUNT_FLOAT = "android.view.accessibility.action.ARGUMENT_SCROLL_AMOUNT_FLOAT";
		field public static final String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT";
		field public static final String ACTION_ARGUMENT_SELECTION_START_INT = "ACTION_ARGUMENT_SELECTION_START_INT";
		field public static final String ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE = "ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE";
		@@ -54395,10 +54395,9 @@ package android.view.accessibility {
		public static final class AccessibilityNodeInfo.CollectionInfo {
		ctor public AccessibilityNodeInfo.CollectionInfo(int, int, boolean);
		ctor public AccessibilityNodeInfo.CollectionInfo(int, int, boolean, int);
		ctor public AccessibilityNodeInfo.CollectionInfo(int, int, boolean, int, int, int);
		method public int getColumnCount();
		method public int getImportantForAccessibilityItemCount();
		method public int getItemCount();
		method @FlaggedApi("android.view.accessibility.collection_info_item_counts") public int getImportantForAccessibilityItemCount();
		method @FlaggedApi("android.view.accessibility.collection_info_item_counts") public int getItemCount();
		method public int getRowCount();
		method public int getSelectionMode();
		method public boolean isHierarchical();
		@@ -54407,18 +54406,18 @@ package android.view.accessibility {
		field public static final int SELECTION_MODE_MULTIPLE = 2; // 0x2
		field public static final int SELECTION_MODE_NONE = 0; // 0x0
		field public static final int SELECTION_MODE_SINGLE = 1; // 0x1
		field public static final int UNDEFINED = -1; // 0xffffffff
		}

		public static final class AccessibilityNodeInfo.CollectionInfo.Builder {
		ctor public AccessibilityNodeInfo.CollectionInfo.Builder();
		method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo build();
		method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setColumnCount(int);
		method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setHierarchical(boolean);
		method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setImportantForAccessibilityItemCount(int);
		method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setItemCount(int);
		method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setRowCount(int);
		method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setSelectionMode(int);
		field @FlaggedApi("android.view.accessibility.collection_info_item_counts") public static final int UNDEFINED = -1; // 0xffffffff
		}

		@FlaggedApi("android.view.accessibility.collection_info_item_counts") public static final class AccessibilityNodeInfo.CollectionInfo.Builder {
		ctor @FlaggedApi("android.view.accessibility.collection_info_item_counts") public AccessibilityNodeInfo.CollectionInfo.Builder();
		method @FlaggedApi("android.view.accessibility.collection_info_item_counts") @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo build();
		method @FlaggedApi("android.view.accessibility.collection_info_item_counts") @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setColumnCount(int);
		method @FlaggedApi("android.view.accessibility.collection_info_item_counts") @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setHierarchical(boolean);
		method @FlaggedApi("android.view.accessibility.collection_info_item_counts") @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setImportantForAccessibilityItemCount(int);
		method @FlaggedApi("android.view.accessibility.collection_info_item_counts") @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setItemCount(int);
		method @FlaggedApi("android.view.accessibility.collection_info_item_counts") @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setRowCount(int);
		method @FlaggedApi("android.view.accessibility.collection_info_item_counts") @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo.Builder setSelectionMode(int);
		}

		public static final class AccessibilityNodeInfo.CollectionItemInfo {

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+17 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import static java.util.Collections.EMPTY_LIST;

		import android.accessibilityservice.AccessibilityService;
		import android.accessibilityservice.AccessibilityServiceInfo;
		import android.annotation.Hide;
		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -752,6 +752,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* {@link #isGranularScrollingSupported()} to check if granular scrolling is supported.
		* </p>
		*/
		@FlaggedApi(Flags.FLAG_GRANULAR_SCROLLING)
		public static final String ACTION_ARGUMENT_SCROLL_AMOUNT_FLOAT =
		"android.view.accessibility.action.ARGUMENT_SCROLL_AMOUNT_FLOAT";

		@@ -2608,6 +2609,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* @return True if all scroll actions that could support
		* {@link #ACTION_ARGUMENT_SCROLL_AMOUNT_FLOAT} have done so, false otherwise.
		*/
		@FlaggedApi(Flags.FLAG_GRANULAR_SCROLLING)
		public boolean isGranularScrollingSupported() {
		return getBooleanProperty(BOOLEAN_PROPERTY_SUPPORTS_GRANULAR_SCROLLING);
		}
		@@ -2626,6 +2628,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		*
		* @throws IllegalStateException If called from an AccessibilityService.
		*/
		@FlaggedApi(Flags.FLAG_GRANULAR_SCROLLING)
		public void setGranularScrollingSupported(boolean granularScrollingSupported) {
		setBooleanProperty(BOOLEAN_PROPERTY_SUPPORTS_GRANULAR_SCROLLING,
		granularScrollingSupported);
		@@ -6119,6 +6122,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* This should be used for {@code mItemCount} and
		* {@code mImportantForAccessibilityItemCount} when values for those fields are not known.
		*/
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public static final int UNDEFINED = -1;

		private int mRowCount;
		@@ -6229,8 +6233,8 @@ public class AccessibilityNodeInfo implements Parcelable {
		* the item count is not known.
		* @param importantForAccessibilityItemCount The count of the collection's views considered
		* important for accessibility.
		* @hide
		*/
		@Hide
		public CollectionInfo(int rowCount, int columnCount, boolean hierarchical,
		int selectionMode, int itemCount, int importantForAccessibilityItemCount) {
		mRowCount = rowCount;
		@@ -6287,6 +6291,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		*
		* @return The count of items, which may be {@code UNDEFINED} if the count is not known.
		*/
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public int getItemCount() {
		return mItemCount;
		}
		@@ -6297,6 +6302,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* @return The count of items important for accessibility, which may be {@code UNDEFINED}
		* if the count is not known.
		*/
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public int getImportantForAccessibilityItemCount() {
		return mImportantForAccessibilityItemCount;
		}
		@@ -6323,6 +6329,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* The builder for CollectionInfo.
		*/

		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public static final class Builder {
		private int mRowCount = 0;
		private int mColumnCount = 0;
		@@ -6334,6 +6341,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		/**
		* Creates a new Builder.
		*/
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public Builder() {
		}

		@@ -6343,6 +6351,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* @return This builder.
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public CollectionInfo.Builder setRowCount(int rowCount) {
		mRowCount = rowCount;
		return this;
		@@ -6354,6 +6363,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* @return This builder.
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public CollectionInfo.Builder setColumnCount(int columnCount) {
		mColumnCount = columnCount;
		return this;
		@@ -6364,6 +6374,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* @return This builder.
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public CollectionInfo.Builder setHierarchical(boolean hierarchical) {
		mHierarchical = hierarchical;
		return this;
		@@ -6375,6 +6386,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* @return This builder.
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public CollectionInfo.Builder setSelectionMode(int selectionMode) {
		mSelectionMode = selectionMode;
		return this;
		@@ -6389,6 +6401,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* @return This builder.
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public CollectionInfo.Builder setItemCount(int itemCount) {
		mItemCount = itemCount;
		return this;
		@@ -6401,6 +6414,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* @return This builder.
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public CollectionInfo.Builder setImportantForAccessibilityItemCount(
		int importantForAccessibilityItemCount) {
		mImportantForAccessibilityItemCount = importantForAccessibilityItemCount;
		@@ -6411,6 +6425,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* Creates a new {@link CollectionInfo} instance.
		*/
		@NonNull
		@FlaggedApi(Flags.FLAG_COLLECTION_INFO_ITEM_COUNTS)
		public CollectionInfo build() {
		CollectionInfo collectionInfo = new CollectionInfo(mRowCount, mColumnCount,
		mHierarchical);

core/java/android/view/accessibility/flags/accessibility_flags.aconfig

+14 −0

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

		flag {
		namespace: "accessibility"
		name: "collection_info_item_counts"
		description: "Fields for total items and the number of important for accessibility items in a collection"
		bug: "302376158"
		}

		flag {
		name: "deduplicate_accessibility_warning_dialog"
		namespace: "accessibility"
		@@ -37,6 +44,13 @@ flag {
		bug: "282821643"
		}

		flag {
		namespace: "accessibility"
		name: "granular_scrolling"
		description: "Allow the use of granular scrolling. This allows scrollable nodes to scroll by increments other than a full screen"
		bug: "302376158"
		}

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