Merge "Remove AccessibilityAction.ACTION_CLICK from AbsListView." (3aa76940) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsListView.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -1517,6 +1517,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		info.setScrollable(true);
		}
		}

		info.removeAction(AccessibilityAction.ACTION_CLICK);
		info.setClickable(false);
		}

		int getSelectionModeForAccessibility() {
		@@ -2471,7 +2474,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		}
		} return false;
		case AccessibilityNodeInfo.ACTION_CLICK: {
		if (isClickable()) {
		if (isItemClickable(host, position)) {
		return performItemClick(host, position, id);
		}
		} return false;
		@@ -2514,7 +2517,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		info.addAction(AccessibilityAction.ACTION_SELECT);
		}

		if (isClickable()) {
		if (isItemClickable(view, position)) {
		info.addAction(AccessibilityAction.ACTION_CLICK);
		info.setClickable(true);
		}
		@@ -2525,6 +2528,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		}
		}

		private boolean isItemClickable(View view, int position) {
		return mAdapter != null && view != null &&
		mAdapter.isEnabled(position) && !view.hasFocusable();
		}

		/**
		* Positions the selector in a way that mimics touch.
		*/