Merge "Correctly advertise accessibility scrolling actions" into lmp-dev (80c0bbe8) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsListView.java

+32 −24

Original line number	Diff line number	Diff line
		@@ -1493,11 +1493,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		super.onInitializeAccessibilityNodeInfo(info);
		info.setClassName(AbsListView.class.getName());
		if (isEnabled()) {
		if (getFirstVisiblePosition() > 0) {
		if (canScrollUp()) {
		info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
		info.setScrollable(true);
		}
		if (getLastVisiblePosition() < getCount() - 1) {
		if (canScrollDown()) {
		info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
		info.setScrollable(true);
		}
		@@ -2203,6 +2203,15 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te

		void updateScrollIndicators() {
		if (mScrollUp != null) {
		mScrollUp.setVisibility(canScrollUp() ? View.VISIBLE : View.INVISIBLE);
		}

		if (mScrollDown != null) {
		mScrollDown.setVisibility(canScrollDown() ? View.VISIBLE : View.INVISIBLE);
		}
		}

		private boolean canScrollUp() {
		boolean canScrollUp;
		// 0th element is not visible
		canScrollUp = mFirstPosition > 0;
		@@ -2215,10 +2224,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		}
		}

		mScrollUp.setVisibility(canScrollUp ? View.VISIBLE : View.INVISIBLE);
		return canScrollUp;
		}

		if (mScrollDown != null) {
		private boolean canScrollDown() {
		boolean canScrollDown;
		int count = getChildCount();

		@@ -2231,8 +2240,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		canScrollDown = child.getBottom() > mBottom - mListPadding.bottom;
		}

		mScrollDown.setVisibility(canScrollDown ? View.VISIBLE : View.INVISIBLE);
		}
		return canScrollDown;
		}

		@Override