Merge "Refatoring a bit of accessibility code" (ed9a34d5) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsListView.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -2571,17 +2571,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		return false;
		}

		@Override
		public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
		// Add a record for ourselves as well.
		AccessibilityEvent record = AccessibilityEvent.obtain();
		// Set the class since it is not populated in #dispatchPopulateAccessibilityEvent
		record.setClassName(getClass().getName());
		child.dispatchPopulateAccessibilityEvent(record);
		event.appendRecord(record);
		return true;
		}

		@Override
		public boolean onKeyDown(int keyCode, KeyEvent event) {
		return false;

+16 −2

Original line number	Diff line number	Diff line
		@@ -887,14 +887,28 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
		// We first get a chance to populate the event.
		onPopulateAccessibilityEvent(event);

		return false;
		}

		@Override
		public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
		// We send selection events only from AdapterView to avoid
		// generation of such event for each child.
		View selectedView = getSelectedView();
		if (selectedView != null) {
		return selectedView.dispatchPopulateAccessibilityEvent(event);
		selectedView.dispatchPopulateAccessibilityEvent(event);
		}
		}

		return false;
		@Override
		public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
		// Add a record for ourselves as well.
		AccessibilityEvent record = AccessibilityEvent.obtain();
		// Set the class since it is not populated in #dispatchPopulateAccessibilityEvent
		record.setClassName(getClass().getName());
		child.dispatchPopulateAccessibilityEvent(record);
		event.appendRecord(record);
		return true;
		}

		@Override