Merge "Reduce unnecessary accessibility cache clearing." into nyc-dev (af93306a) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+18 −5

Original line number	Diff line number	Diff line
		@@ -8877,7 +8877,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @hide
		*/
		public void clearAccessibilityFocus() {
		clearAccessibilityFocusNoCallbacks();
		clearAccessibilityFocusNoCallbacks(0);

		// Clear the global reference of accessibility focus if this view or
		// any of its descendants had accessibility focus. This will NOT send
		@@ -8920,14 +8920,27 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		/**
		* Clears accessibility focus without calling any callback methods
		* normally invoked in {@link #clearAccessibilityFocus()}. This method
		* is used for clearing accessibility focus when giving this focus to
		* another view.
		* is used separately from that one for clearing accessibility focus when
		* giving this focus to another view.
		*
		* @param action The action, if any, that led to focus being cleared. Set to
		* AccessibilityNodeInfo#ACTION_ACCESSIBILITY_FOCUS to specify that focus is moving within
		* the window.
		*/
		void clearAccessibilityFocusNoCallbacks() {
		void clearAccessibilityFocusNoCallbacks(int action) {
		if ((mPrivateFlags2 & PFLAG2_ACCESSIBILITY_FOCUSED) != 0) {
		mPrivateFlags2 &= ~PFLAG2_ACCESSIBILITY_FOCUSED;
		invalidate();
		sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);
		if (AccessibilityManager.getInstance(mContext).isEnabled()) {
		AccessibilityEvent event = AccessibilityEvent.obtain(
		AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED);
		event.setAction(action);
		if (mAccessibilityDelegate != null) {
		mAccessibilityDelegate.sendAccessibilityEventUnchecked(this, event);
		} else {
		sendAccessibilityEventUnchecked(event);
		}
		}
		}
		}

core/java/android/view/ViewRootImpl.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -3074,7 +3074,8 @@ public final class ViewRootImpl implements ViewParent,

		// Clear accessibility focus on the host after clearing state since
		// this method may be reentrant.
		focusHost.clearAccessibilityFocusNoCallbacks();
		focusHost.clearAccessibilityFocusNoCallbacks(
		AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);

		AccessibilityNodeProvider provider = focusHost.getAccessibilityNodeProvider();
		if (provider != null) {
		@@ -3091,7 +3092,8 @@ public final class ViewRootImpl implements ViewParent,
		}
		if (mAccessibilityFocusedHost != null) {
		// Clear accessibility focus in the view.
		mAccessibilityFocusedHost.clearAccessibilityFocusNoCallbacks();
		mAccessibilityFocusedHost.clearAccessibilityFocusNoCallbacks(
		AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
		}

		// Set the new focus host and node.
		@@ -6626,7 +6628,7 @@ public final class ViewRootImpl implements ViewParent,
		// Error state: virtual view with no provider. Clear focus.
		mAccessibilityFocusedHost = null;
		mAccessibilityFocusedVirtualView = null;
		focusedHost.clearAccessibilityFocusNoCallbacks();
		focusedHost.clearAccessibilityFocusNoCallbacks(0);
		return;
		}

		@@ -6676,7 +6678,7 @@ public final class ViewRootImpl implements ViewParent,
		if (mAccessibilityFocusedVirtualView == null) {
		// Error state: The node no longer exists. Clear focus.
		mAccessibilityFocusedHost = null;
		focusedHost.clearAccessibilityFocusNoCallbacks();
		focusedHost.clearAccessibilityFocusNoCallbacks(0);

		// This will probably fail, but try to keep the provider's internal
		// state consistent by clearing focus.

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -439,7 +439,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		}
		if (mSecurityPolicy.canDispatchAccessibilityEventLocked(event)) {
		mSecurityPolicy.updateActiveAndAccessibilityFocusedWindowLocked(event.getWindowId(),
		event.getSourceNodeId(), event.getEventType());
		event.getSourceNodeId(), event.getEventType(), event.getAction());
		mSecurityPolicy.updateEventSourceLocked(event);
		notifyAccessibilityServicesDelayedLocked(event, false);
		notifyAccessibilityServicesDelayedLocked(event, true);
		@@ -3828,7 +3828,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		}

		public void updateActiveAndAccessibilityFocusedWindowLocked(int windowId, long nodeId,
		int eventType) {
		int eventType, int eventAction) {
		// The active window is either the window that has input focus or
		// the window that the user is currently touching. If the user is
		// touching a window that does not have input focus as soon as the
		@@ -3881,8 +3881,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		if (mAccessibilityFocusNodeId == nodeId) {
		mAccessibilityFocusNodeId = AccessibilityNodeInfo.UNDEFINED_ITEM_ID;
		}
		if (mAccessibilityFocusNodeId == AccessibilityNodeInfo.UNDEFINED_ITEM_ID
		&& mAccessibilityFocusedWindowId == windowId) {
		// Clear the window with focus if it no longer has focus and we aren't
		// just moving focus from one view to the other in the same window
		if ((mAccessibilityFocusNodeId == AccessibilityNodeInfo.UNDEFINED_ITEM_ID)
		&& (mAccessibilityFocusedWindowId == windowId)
		&& (eventAction != AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS)
		) {
		mAccessibilityFocusedWindowId = INVALID_WINDOW_ID;
		}
		}