Merge "[Selection API] Add Selection API implementation" into main (44a905df) · Commits · e / os / android_frameworks_base

core/api/current.txt

+25 −0

Original line number	Diff line number	Diff line
		@@ -2419,6 +2419,7 @@ package android {
		field public static final int accessibilityActionScrollRight = 16908347; // 0x102003b
		field public static final int accessibilityActionScrollToPosition = 16908343; // 0x1020037
		field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038
		field @FlaggedApi("android.view.accessibility.a11y_selection_api") public static final int accessibilityActionSetExtendedSelection;
		field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d
		field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036
		field public static final int accessibilityActionShowTextSuggestions = 16908376; // 0x1020058
		@@ -56266,6 +56267,7 @@ package android.view.accessibility {
		method public android.view.accessibility.AccessibilityNodeInfo getParent();
		method @Nullable public android.view.accessibility.AccessibilityNodeInfo getParent(int);
		method public android.view.accessibility.AccessibilityNodeInfo.RangeInfo getRangeInfo();
		method @FlaggedApi("android.view.accessibility.a11y_selection_api") @Nullable public android.view.accessibility.AccessibilityNodeInfo.Selection getSelection();
		method @Nullable public CharSequence getStateDescription();
		method @FlaggedApi("android.view.accessibility.supplemental_description") @Nullable public CharSequence getSupplementalDescription();
		method public CharSequence getText();
		@@ -56374,6 +56376,7 @@ package android.view.accessibility {
		method public void setScreenReaderFocusable(boolean);
		method public void setScrollable(boolean);
		method public void setSelected(boolean);
		method @FlaggedApi("android.view.accessibility.a11y_selection_api") public void setSelection(@Nullable android.view.accessibility.AccessibilityNodeInfo.Selection);
		method public void setShowingHintText(boolean);
		method public void setSource(android.view.View);
		method public void setSource(android.view.View, int);
		@@ -56406,6 +56409,7 @@ package android.view.accessibility {
		field public static final String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT";
		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 @FlaggedApi("android.view.accessibility.a11y_selection_api") public static final String ACTION_ARGUMENT_SELECTION_PARCELABLE = "android.view.accessibility.action.ARGUMENT_SELECTION_PARCELABLE";
		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";
		field public static final int ACTION_CLEAR_ACCESSIBILITY_FOCUS = 128; // 0x80
		@@ -56503,6 +56507,7 @@ package android.view.accessibility {
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_TO_POSITION;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_UP;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SELECT;
		field @FlaggedApi("android.view.accessibility.a11y_selection_api") @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_EXTENDED_SELECTION;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_PROGRESS;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_SELECTION;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT;
		@@ -56588,6 +56593,26 @@ package android.view.accessibility {
		field public static final int RANGE_TYPE_PERCENT = 2; // 0x2
		}

		@FlaggedApi("android.view.accessibility.a11y_selection_api") public static final class AccessibilityNodeInfo.Selection implements android.os.Parcelable {
		ctor public AccessibilityNodeInfo.Selection(@NonNull android.view.accessibility.AccessibilityNodeInfo.SelectionPosition, @NonNull android.view.accessibility.AccessibilityNodeInfo.SelectionPosition);
		method public int describeContents();
		method @NonNull public android.view.accessibility.AccessibilityNodeInfo.SelectionPosition getEnd();
		method @NonNull public android.view.accessibility.AccessibilityNodeInfo.SelectionPosition getStart();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo.Selection> CREATOR;
		}

		@FlaggedApi("android.view.accessibility.a11y_selection_api") public static final class AccessibilityNodeInfo.SelectionPosition implements android.os.Parcelable {
		ctor public AccessibilityNodeInfo.SelectionPosition(@NonNull android.view.accessibility.AccessibilityNodeInfo, int);
		ctor public AccessibilityNodeInfo.SelectionPosition(@NonNull android.view.View, int);
		ctor public AccessibilityNodeInfo.SelectionPosition(@NonNull android.view.View, int, int);
		method public int describeContents();
		method @Nullable public android.view.accessibility.AccessibilityNodeInfo getNode();
		method public int getOffset();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo.SelectionPosition> CREATOR;
		}

		public static final class AccessibilityNodeInfo.TouchDelegateInfo implements android.os.Parcelable {
		ctor public AccessibilityNodeInfo.TouchDelegateInfo(@NonNull java.util.Map<android.graphics.Region,android.view.View>);
		method public int describeContents();

core/api/lint-baseline.txt

+3 −14

Original line number	Diff line number	Diff line

		// Baseline format: 1.0
		BroadcastBehavior: android.app.AlarmManager#ACTION_NEXT_ALARM_CLOCK_CHANGED:
		Field 'ACTION_NEXT_ALARM_CLOCK_CHANGED' is missing @BroadcastBehavior
		@@ -243,8 +244,6 @@ BroadcastBehavior: android.telephony.TelephonyManager#ACTION_SUBSCRIPTION_SPECIF
		Field 'ACTION_SUBSCRIPTION_SPECIFIC_CARRIER_IDENTITY_CHANGED' is missing @BroadcastBehavior
		BroadcastBehavior: android.telephony.euicc.EuiccManager#ACTION_NOTIFY_CARRIER_SETUP_INCOMPLETE:
		Field 'ACTION_NOTIFY_CARRIER_SETUP_INCOMPLETE' is missing @BroadcastBehavior


		DeprecationMismatch: android.accounts.AccountManager#newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, String[], boolean, String, String, String[], android.os.Bundle):
		Method android.accounts.AccountManager.newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, String[], boolean, String, String, String[], android.os.Bundle): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
		DeprecationMismatch: android.app.Activity#enterPictureInPictureMode():
		@@ -381,8 +380,6 @@ DeprecationMismatch: android.webkit.WebViewDatabase#hasFormData():
		Method android.webkit.WebViewDatabase.hasFormData(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
		DeprecationMismatch: javax.microedition.khronos.egl.EGL10#eglCreatePixmapSurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, Object, int[]):
		Method javax.microedition.khronos.egl.EGL10.eglCreatePixmapSurface(javax.microedition.khronos.egl.EGLDisplay, javax.microedition.khronos.egl.EGLConfig, Object, int[]): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match


		FlaggedApiLiteral: android.Manifest.permission#BIND_APP_FUNCTION_SERVICE:
		@FlaggedApi contains a string literal, but should reference the field generated by aconfig (android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER).
		FlaggedApiLiteral: android.Manifest.permission#BIND_TV_AD_SERVICE:
		@@ -405,26 +402,22 @@ FlaggedApiLiteral: android.R.attr#optional:
		@FlaggedApi contains a string literal, but should reference the field generated by aconfig (android.content.pm.Flags.FLAG_SDK_LIB_INDEPENDENCE).
		FlaggedApiLiteral: android.R.attr#supplementalDescription:
		@FlaggedApi contains a string literal, but should reference the field generated by aconfig (android.view.accessibility.Flags.FLAG_SUPPLEMENTAL_DESCRIPTION).
		FlaggedApiLiteral: android.R.id#accessibilityActionSetExtendedSelection:
		@FlaggedApi contains a string literal, but should reference the field generated by aconfig (android.view.accessibility.Flags.FLAG_A11Y_SELECTION_API).
		FlaggedApiLiteral: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INTERNAL_ERROR:
		@FlaggedApi contains a string literal, but should reference the field generated by aconfig (android.view.accessibility.Flags.FLAG_A11Y_OVERLAY_CALLBACKS).
		FlaggedApiLiteral: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INVALID:
		@FlaggedApi contains a string literal, but should reference the field generated by aconfig (android.view.accessibility.Flags.FLAG_A11Y_OVERLAY_CALLBACKS).
		FlaggedApiLiteral: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_SUCCESS:
		@FlaggedApi contains a string literal, but should reference the field generated by aconfig (android.view.accessibility.Flags.FLAG_A11Y_OVERLAY_CALLBACKS).


		InvalidNullabilityOverride: android.app.Notification.TvExtender#extend(android.app.Notification.Builder) parameter #0:
		Invalid nullability on parameter `builder` in method `extend`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
		InvalidNullabilityOverride: android.media.midi.MidiUmpDeviceService#onBind(android.content.Intent) parameter #0:
		Invalid nullability on parameter `intent` in method `onBind`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.


		KotlinOperator: android.graphics.Matrix44#get(int, int):
		Method can be invoked with an indexing operator from Kotlin: `get` (this is usually desirable; just make sure it makes sense for this type of object)
		KotlinOperator: android.graphics.Matrix44#set(int, int, float):
		Method can be invoked with an indexing operator from Kotlin: `set` (this is usually desirable; just make sure it makes sense for this type of object)


		MissingGetterMatchingBuilder: android.os.RemoteCallbackList.Builder#setInterfaceDiedCallback(android.os.RemoteCallbackList.Builder.InterfaceDiedCallback<E>):
		android.os.RemoteCallbackList does not declare a `getInterfaceDiedCallback()` method matching method android.os.RemoteCallbackList.Builder.setInterfaceDiedCallback(android.os.RemoteCallbackList.Builder.InterfaceDiedCallback<E>)
		RequiresPermission: android.accounts.AccountManager#getAccountsByTypeAndFeatures(String, String[], android.accounts.AccountManagerCallback<android.accounts.Account[]>, android.os.Handler):
		@@ -1117,14 +1110,10 @@ RequiresPermission: android.webkit.WebSettings#setBlockNetworkLoads(boolean):
		Method 'setBlockNetworkLoads' documentation mentions permissions without declaring @RequiresPermission
		RequiresPermission: android.webkit.WebSettings#setGeolocationEnabled(boolean):
		Method 'setGeolocationEnabled' documentation mentions permissions without declaring @RequiresPermission


		Todo: android.hardware.camera2.params.StreamConfigurationMap:
		Documentation mentions 'TODO'
		Todo: android.provider.ContactsContract.RawContacts#newEntityIterator(android.database.Cursor):
		Documentation mentions 'TODO'


		UnflaggedApi: android.R.color#on_surface_disabled_material:
		New API must be flagged with @FlaggedApi: field android.R.color.on_surface_disabled_material
		UnflaggedApi: android.R.color#outline_disabled_material:

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

+405 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/ids.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -157,6 +157,9 @@
		<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_CONTEXT_CLICK}. -->
		<item type="id" name="accessibilityActionContextClick" />

		<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SET_EXTENDED_SELECTION}. -->
		<item type="id" name="accessibilityActionSetExtendedSelection" />

		<item type="id" name="remote_input_tag" />
		<item type="id" name="pending_intent_tag" />
		<item type="id" name="remote_checked_change_listener_tag" />

core/res/res/values/public-staging.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,8 @@
		<staging-public-group type="id" first-id="0x01b20000">
		<!-- @FlaggedApi(android.appwidget.flags.Flags.FLAG_ENGAGEMENT_METRICS) -->
		<public name="remoteViewsMetricsId"/>
		<!-- @FlaggedApi("android.view.accessibility.a11y_selection_api") -->
		<public name="accessibilityActionSetExtendedSelection"/>
		</staging-public-group>

		<staging-public-group type="style" first-id="0x01b10000">