Merge "Don't generate irrelevant a11y events - framework" (229f0d03) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47906,6 +47906,7 @@ package android.view.accessibility {
	method public void interrupt();		method public void interrupt();
	method public static boolean isAccessibilityButtonSupported();		method public static boolean isAccessibilityButtonSupported();
	method public boolean isEnabled();		method public boolean isEnabled();
			method public boolean isObservedEventType(int);
	method public boolean isTouchExplorationEnabled();		method public boolean isTouchExplorationEnabled();
	method public void removeAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);		method public void removeAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);
	method public boolean removeAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);		method public boolean removeAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);

api/test-current.txt

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -958,6 +958,15 @@ package android.view {

	package android.view.accessibility {		package android.view.accessibility {

			public final class AccessibilityManager {
			method public void addAccessibilityServicesStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener, android.os.Handler);
			method public void removeAccessibilityServicesStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);
			}

			public static abstract interface AccessibilityManager.AccessibilityServicesStateChangeListener {
			method public abstract void onAccessibilityServicesStateChanged(android.view.accessibility.AccessibilityManager);
			}

	public class AccessibilityNodeInfo implements android.os.Parcelable {		public class AccessibilityNodeInfo implements android.os.Parcelable {
	method public static void setNumInstancesInUseCounter(java.util.concurrent.atomic.AtomicInteger);		method public static void setNumInstancesInUseCounter(java.util.concurrent.atomic.AtomicInteger);
	}		}

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+3 −3

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

	package android.accessibilityservice;		package android.accessibilityservice;

			import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;

	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	@@ -47,8 +49,6 @@ import java.util.ArrayList;
	import java.util.Collections;		import java.util.Collections;
	import java.util.List;		import java.util.List;

	import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;

	/**		/**
	* This class describes an {@link AccessibilityService}. The system notifies an		* This class describes an {@link AccessibilityService}. The system notifies an
	* {@link AccessibilityService} for {@link android.view.accessibility.AccessibilityEvent}s		* {@link AccessibilityService} for {@link android.view.accessibility.AccessibilityEvent}s
	@@ -554,7 +554,7 @@ public class AccessibilityServiceInfo implements Parcelable {
	}		}

	/**		/**
	* Updates the properties that an AccessibilitySerivice can change dynamically.		* Updates the properties that an AccessibilityService can change dynamically.
	*		*
	* @param other The info from which to update the properties.		* @param other The info from which to update the properties.
	*		*

core/java/android/inputmethodservice/KeyboardView.java

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -21,18 +21,16 @@ import android.content.res.TypedArray;
	import android.graphics.Bitmap;		import android.graphics.Bitmap;
	import android.graphics.Canvas;		import android.graphics.Canvas;
	import android.graphics.Paint;		import android.graphics.Paint;
			import android.graphics.Paint.Align;
	import android.graphics.PorterDuff;		import android.graphics.PorterDuff;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.graphics.Typeface;
	import android.graphics.Paint.Align;
	import android.graphics.Region.Op;		import android.graphics.Region.Op;
			import android.graphics.Typeface;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
	import android.inputmethodservice.Keyboard.Key;		import android.inputmethodservice.Keyboard.Key;
	import android.media.AudioManager;		import android.media.AudioManager;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Message;		import android.os.Message;
	import android.os.UserHandle;
	import android.provider.Settings;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	import android.util.TypedValue;		import android.util.TypedValue;
	import android.view.GestureDetector;		import android.view.GestureDetector;
	@@ -986,6 +984,9 @@ public class KeyboardView extends View implements View.OnClickListener {

	private void sendAccessibilityEventForUnicodeCharacter(int eventType, int code) {		private void sendAccessibilityEventForUnicodeCharacter(int eventType, int code) {
	if (mAccessibilityManager.isEnabled()) {		if (mAccessibilityManager.isEnabled()) {
			if (!mAccessibilityManager.isObservedEventType(eventType)) {
			return;
			}
	AccessibilityEvent event = AccessibilityEvent.obtain(eventType);		AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
	onInitializeAccessibilityEvent(event);		onInitializeAccessibilityEvent(event);
	final String text;		final String text;

core/java/android/view/View.java

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -7208,7 +7208,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* @param text The announcement text.		* @param text The announcement text.
	*/		*/
	public void announceForAccessibility(CharSequence text) {		public void announceForAccessibility(CharSequence text) {
	if (AccessibilityManager.getInstance(mContext).isEnabled() && mParent != null) {		if (AccessibilityManager.getInstance(mContext).isObservedEventType(
			AccessibilityEvent.TYPE_ANNOUNCEMENT) && mParent != null) {
	AccessibilityEvent event = AccessibilityEvent.obtain(		AccessibilityEvent event = AccessibilityEvent.obtain(
	AccessibilityEvent.TYPE_ANNOUNCEMENT);		AccessibilityEvent.TYPE_ANNOUNCEMENT);
	onInitializeAccessibilityEvent(event);		onInitializeAccessibilityEvent(event);
	@@ -10967,7 +10968,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	if ((mPrivateFlags2 & PFLAG2_ACCESSIBILITY_FOCUSED) != 0) {		if ((mPrivateFlags2 & PFLAG2_ACCESSIBILITY_FOCUSED) != 0) {
	mPrivateFlags2 &= ~PFLAG2_ACCESSIBILITY_FOCUSED;		mPrivateFlags2 &= ~PFLAG2_ACCESSIBILITY_FOCUSED;
	invalidate();		invalidate();
	if (AccessibilityManager.getInstance(mContext).isEnabled()) {		if (AccessibilityManager.getInstance(mContext).isObservedEventType(
			AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED)) {
	AccessibilityEvent event = AccessibilityEvent.obtain(		AccessibilityEvent event = AccessibilityEvent.obtain(
	AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);		AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);
	event.setAction(action);		event.setAction(action);
	@@ -11792,7 +11794,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

	private void sendViewTextTraversedAtGranularityEvent(int action, int granularity,		private void sendViewTextTraversedAtGranularityEvent(int action, int granularity,
	int fromIndex, int toIndex) {		int fromIndex, int toIndex) {
	if (mParent == null) {		if (mParent == null \|\| !AccessibilityManager.getInstance(mContext).isObservedEventType(
			AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY)) {
	return;		return;
	}		}
	AccessibilityEvent event = AccessibilityEvent.obtain(		AccessibilityEvent event = AccessibilityEvent.obtain(
	@@ -26182,7 +26185,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

	@Override		@Override
	public void run() {		public void run() {
	if (AccessibilityManager.getInstance(mContext).isEnabled()) {		if (AccessibilityManager.getInstance(mContext).isObservedEventType(
			AccessibilityEvent.TYPE_VIEW_SCROLLED)) {
	AccessibilityEvent event = AccessibilityEvent.obtain(		AccessibilityEvent event = AccessibilityEvent.obtain(
	AccessibilityEvent.TYPE_VIEW_SCROLLED);		AccessibilityEvent.TYPE_VIEW_SCROLLED);
	event.setScrollDeltaX(mDeltaX);		event.setScrollDeltaX(mDeltaX);