Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev (c8163201) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsListView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1546,7 +1546,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		switch (action) {
		case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD:
		case R.id.accessibilityActionScrollDown: {
		if (isEnabled() && getLastVisiblePosition() < getCount() - 1) {
		if (isEnabled() && canScrollDown()) {
		final int viewportHeight = getHeight() - mListPadding.top - mListPadding.bottom;
		smoothScrollBy(viewportHeight, PositionScroller.SCROLL_DURATION);
		return true;
		@@ -1554,7 +1554,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		} return false;
		case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD:
		case R.id.accessibilityActionScrollUp: {
		if (isEnabled() && mFirstPosition > 0) {
		if (isEnabled() && canScrollUp()) {
		final int viewportHeight = getHeight() - mListPadding.top - mListPadding.bottom;
		smoothScrollBy(-viewportHeight, PositionScroller.SCROLL_DURATION);
		return true;