Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-10 20:57:21 +00:00
committed by Android (Google) Code Review
parent fc13448507 47be54bb78
commit c816320161
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/AbsListView.java
View File

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