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

Merge "Don't smooth scroll if the adapter is null"

Browse Source
This commit is contained in:
Alan Viverette
2014-02-28 20:22:53 +00:00
committed by Android (Google) Code Review
parent ce601aee4c 2ac93ae919
commit 5523db2ea3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7160,8 +7160,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
return;
}
if (mAdapter == null) {
// Can't scroll anywhere without an adapter.
return;
}
final int itemCount = getCount();
final int clampedPosition = MathUtils.constrain(targetPosition, 0, itemCount - 1);
final int clampedBoundPosition = MathUtils.constrain(boundPosition, 0, itemCount - 1);
final int firstPosition = getFirstVisiblePosition();
final int lastPosition = firstPosition + getChildCount();
final int targetRow = getRowForPosition(clampedPosition);
@@ -7180,8 +7186,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
}
float endSubRow = targetRow;
if (boundPosition != INVALID_POSITION) {
final int boundRow = getRowForPosition(boundPosition);
if (clampedBoundPosition != INVALID_POSITION) {
final int boundRow = getRowForPosition(clampedBoundPosition);
if (boundRow >= firstRow && boundRow < lastRow && boundRow != targetRow) {
endSubRow = computeBoundSubRow(targetRow, boundRow);
}