Merge "Adding system support for a single accessibility focus." (0f7ed1f4) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -2456,6 +2456,7 @@ package android.accessibilityservice {

		public abstract class AccessibilityService extends android.app.Service {
		ctor public AccessibilityService();
		method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
		method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
		method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
		method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
		@@ -4755,6 +4756,7 @@ package android.app {
		method public void clearWindowAnimationFrameStats();
		method public boolean clearWindowContentFrameStats(int);
		method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;
		method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
		method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
		method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
		method public android.view.WindowAnimationFrameStats getWindowAnimationFrameStats();

+25 −0

Original line number	Diff line number	Diff line
		@@ -525,6 +525,31 @@ public abstract class AccessibilityService extends Service {
		return false;
		}

		/**
		* Find the view that has the specified focus type. The search is performed
		* across all windows.
		* <p>
		* <strong>Note:</strong> In order to access the windows your service has
		* to declare the capability to retrieve window content by setting the
		* {@link android.R.styleable#AccessibilityService_canRetrieveWindowContent}
		* property in its meta-data. For details refer to {@link #SERVICE_META_DATA}.
		* Also the service has to opt-in to retrieve the interactive windows by
		* setting the {@link AccessibilityServiceInfo#FLAG_RETRIEVE_INTERACTIVE_WINDOWS}
		* flag.Otherwise, the search will be performed only in the active window.
		* </p>
		*
		* @param focus The focus to find. One of {@link AccessibilityNodeInfo#FOCUS_INPUT} or
		* {@link AccessibilityNodeInfo#FOCUS_ACCESSIBILITY}.
		* @return The node info of the focused view or null.
		*
		* @see AccessibilityNodeInfo#FOCUS_INPUT
		* @see AccessibilityNodeInfo#FOCUS_ACCESSIBILITY
		*/
		public AccessibilityNodeInfo findFocus(int focus) {
		return AccessibilityInteractionClient.getInstance().findFocus(mConnectionId,
		AccessibilityNodeInfo.ANY_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, focus);
		}

		/**
		* Gets the an {@link AccessibilityServiceInfo} describing this
		* {@link AccessibilityService}. This method is useful if one wants

+22 −0

Original line number	Diff line number	Diff line
		@@ -296,6 +296,28 @@ public final class UiAutomation {
		return false;
		}

		/**
		* Find the view that has the specified focus type. The search is performed
		* across all windows.
		* <p>
		* <strong>Note:</strong> In order to access the windows you have to opt-in
		* to retrieve the interactive windows by setting the
		* {@link AccessibilityServiceInfo#FLAG_RETRIEVE_INTERACTIVE_WINDOWS} flag.
		* Otherwise, the search will be performed only in the active window.
		* </p>
		*
		* @param focus The focus to find. One of {@link AccessibilityNodeInfo#FOCUS_INPUT} or
		* {@link AccessibilityNodeInfo#FOCUS_ACCESSIBILITY}.
		* @return The node info of the focused view or null.
		*
		* @see AccessibilityNodeInfo#FOCUS_INPUT
		* @see AccessibilityNodeInfo#FOCUS_ACCESSIBILITY
		*/
		public AccessibilityNodeInfo findFocus(int focus) {
		return AccessibilityInteractionClient.getInstance().findFocus(mConnectionId,
		AccessibilityNodeInfo.ANY_WINDOW_ID, AccessibilityNodeInfo.ROOT_NODE_ID, focus);
		}

		/**
		* Gets the an {@link AccessibilityServiceInfo} describing this UiAutomation.
		* This method is useful if one wants to change some of the dynamically

+0 −5

Original line number	Diff line number	Diff line
		@@ -8790,11 +8790,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		&& !pointInView(event.getX(), event.getY()))) {
		mSendingHoverAccessibilityEvents = false;
		sendAccessibilityHoverEvent(AccessibilityEvent.TYPE_VIEW_HOVER_EXIT);
		// If the window does not have input focus we take away accessibility
		// focus as soon as the user stop hovering over the view.
		if (mAttachInfo != null && !mAttachInfo.mHasWindowFocus) {
		getViewRootImpl().setAccessibilityFocus(null, null);
		}
		}
		}

+13 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,19 @@ public final class AccessibilityInteractionClient
		false, AccessibilityNodeInfo.FLAG_PREFETCH_DESCENDANTS);
		}

		/**
		* Gets the root {@link AccessibilityNodeInfo} in a given window.
		*
		* @param connectionId The id of a connection for interacting with the system.
		* @param windowId The window id.
		* @return The root {@link AccessibilityNodeInfo} if found, null otherwise.
		*/
		public AccessibilityNodeInfo getRootInWindow(int connectionId, int windowId) {
		return findAccessibilityNodeInfoByAccessibilityId(connectionId, windowId,
		AccessibilityNodeInfo.ROOT_NODE_ID, false,
		AccessibilityNodeInfo.FLAG_PREFETCH_DESCENDANTS);
		}

		/**
		* Gets the info for a window.
		*