Merge "Fix accessibility delegation" (2d4c476a) · Commits · e / os / android_frameworks_base

core/java/android/appwidget/AppWidgetHostView.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -588,9 +588,10 @@ public class AppWidgetHostView extends FrameLayout {
		return tv;
		}

		/** @hide */
		@Override
		public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfo(info);
		public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfoInternal(info);
		info.setClassName(AppWidgetHostView.class.getName());
		}

core/java/android/view/View.java

+22 −8

Original line number	Diff line number	Diff line
		@@ -5218,8 +5218,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #sendAccessibilityEvent(int)
		*
		* Note: Called from the default {@link AccessibilityDelegate}.
		*
		* @hide
		*/
		void sendAccessibilityEventInternal(int eventType) {
		public void sendAccessibilityEventInternal(int eventType) {
		if (AccessibilityManager.getInstance(mContext).isEnabled()) {
		sendAccessibilityEventUnchecked(AccessibilityEvent.obtain(eventType));
		}
		@@ -5252,8 +5254,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #sendAccessibilityEventUnchecked(AccessibilityEvent)
		*
		* Note: Called from the default {@link AccessibilityDelegate}.
		*
		* @hide
		*/
		void sendAccessibilityEventUncheckedInternal(AccessibilityEvent event) {
		public void sendAccessibilityEventUncheckedInternal(AccessibilityEvent event) {
		if (!isShown()) {
		return;
		}
		@@ -5303,8 +5307,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #dispatchPopulateAccessibilityEvent(AccessibilityEvent)
		*
		* Note: Called from the default {@link AccessibilityDelegate}.
		*
		* @hide
		*/
		boolean dispatchPopulateAccessibilityEventInternal(AccessibilityEvent event) {
		public boolean dispatchPopulateAccessibilityEventInternal(AccessibilityEvent event) {
		onPopulateAccessibilityEvent(event);
		return false;
		}
		@@ -5352,8 +5358,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #onPopulateAccessibilityEvent(AccessibilityEvent)
		*
		* Note: Called from the default {@link AccessibilityDelegate}.
		*
		* @hide
		*/
		void onPopulateAccessibilityEventInternal(AccessibilityEvent event) {
		public void onPopulateAccessibilityEventInternal(AccessibilityEvent event) {
		}

		/**
		@@ -5394,8 +5402,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #onInitializeAccessibilityEvent(AccessibilityEvent)
		*
		* Note: Called from the default {@link AccessibilityDelegate}.
		*
		* @hide
		*/
		void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
		public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
		event.setSource(this);
		event.setClassName(View.class.getName());
		event.setPackageName(getContext().getPackageName());
		@@ -5450,8 +5460,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		/**
		* @see #createAccessibilityNodeInfo()
		*
		* @hide
		*/
		AccessibilityNodeInfo createAccessibilityNodeInfoInternal() {
		public AccessibilityNodeInfo createAccessibilityNodeInfoInternal() {
		AccessibilityNodeProvider provider = getAccessibilityNodeProvider();
		if (provider != null) {
		return provider.createAccessibilityNodeInfo(View.NO_ID);
		@@ -5550,8 +5562,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo)
		*
		* Note: Called from the default {@link AccessibilityDelegate}.
		*
		* @hide
		*/
		void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
		public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
		Rect bounds = mAttachInfo.mTmpInvalRect;

		getDrawingRect(bounds);
		@@ -8133,7 +8147,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* Note: Called from the default {@link AccessibilityDelegate}.
		*
		* @hide Until we've refactored all accessibility delegation methods.
		* @hide
		*/
		public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
		switch (action) {

core/java/android/view/ViewGroup.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -773,8 +773,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		* @see #onRequestSendAccessibilityEvent(View, AccessibilityEvent)
		*
		* Note: Called from the default {@link View.AccessibilityDelegate}.
		*
		* @hide
		*/
		boolean onRequestSendAccessibilityEventInternal(View child, AccessibilityEvent event) {
		public boolean onRequestSendAccessibilityEventInternal(View child, AccessibilityEvent event) {
		return true;
		}

		@@ -2845,8 +2847,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}
		}

		/** @hide */
		@Override
		boolean dispatchPopulateAccessibilityEventInternal(AccessibilityEvent event) {
		public boolean dispatchPopulateAccessibilityEventInternal(AccessibilityEvent event) {
		boolean handled = false;
		if (includeForAccessibility()) {
		handled = super.dispatchPopulateAccessibilityEventInternal(event);
		@@ -2873,8 +2876,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		return false;
		}

		/** @hide */
		@Override
		void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
		public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfoInternal(info);
		if (mAttachInfo != null) {
		final ArrayList<View> childrenForAccessibility = mAttachInfo.mTempArrayList;
		@@ -2889,8 +2893,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}
		}

		/** @hide */
		@Override
		void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
		public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
		super.onInitializeAccessibilityEventInternal(event);
		event.setClassName(ViewGroup.class.getName());
		}

core/java/android/webkit/WebView.java

+13 −10

Original line number	Diff line number	Diff line
		@@ -2070,8 +2070,8 @@ public class WebView extends AbsoluteLayout
		return WebView.super.onHoverEvent(event);
		}

		public boolean super_performAccessibilityAction(int action, Bundle arguments) {
		return WebView.super.performAccessibilityAction(action, arguments);
		public boolean super_performAccessibilityActionInternal(int action, Bundle arguments) {
		return WebView.super.performAccessibilityActionInternal(action, arguments);
		}

		public boolean super_performLongClick() {
		@@ -2379,23 +2379,26 @@ public class WebView extends AbsoluteLayout
		return mProvider.getViewDelegate().shouldDelayChildPressedState();
		}

		/** @hide */
		@Override
		public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfo(info);
		public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
		super.onInitializeAccessibilityNodeInfoInternal(info);
		info.setClassName(WebView.class.getName());
		mProvider.getViewDelegate().onInitializeAccessibilityNodeInfo(info);
		mProvider.getViewDelegate().onInitializeAccessibilityNodeInfoInternal(info);
		}

		/** @hide */
		@Override
		public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
		super.onInitializeAccessibilityEvent(event);
		public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
		super.onInitializeAccessibilityEventInternal(event);
		event.setClassName(WebView.class.getName());
		mProvider.getViewDelegate().onInitializeAccessibilityEvent(event);
		mProvider.getViewDelegate().onInitializeAccessibilityEventInternal(event);
		}

		/** @hide */
		@Override
		public boolean performAccessibilityAction(int action, Bundle arguments) {
		return mProvider.getViewDelegate().performAccessibilityAction(action, arguments);
		public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
		return mProvider.getViewDelegate().performAccessibilityActionInternal(action, arguments);
		}

		/** @hide */

core/java/android/webkit/WebViewProvider.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -292,11 +292,11 @@ public interface WebViewProvider {

		public AccessibilityNodeProvider getAccessibilityNodeProvider();

		public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info);
		public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info);

		public void onInitializeAccessibilityEvent(AccessibilityEvent event);
		public void onInitializeAccessibilityEventInternal(AccessibilityEvent event);

		public boolean performAccessibilityAction(int action, Bundle arguments);
		public boolean performAccessibilityActionInternal(int action, Bundle arguments);

		public void setOverScrollMode(int mode);