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

am ef793669: Merge "Fix a stability regression in ListView arrow scrolling" into jb-mr2-dev

Browse Source 
* commit 'ef79366980ff229dd69b02ab7436ddc1039e8f27':
  Fix a stability regression in ListView arrow scrolling
This commit is contained in:
Adam Powell
2013-03-22 01:18:26 +00:00
committed by Android Git Automerger
parent 7b8dfeb6ad ef79366980
commit 6338eb1165
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/widget/ListView.java
View File

@@ -2416,6 +2416,34 @@ public class ListView extends AbsListView {
}
}
/**
* Used by {@link #arrowScrollImpl(int)} to help determine the next selected position
* to move to. This can return a position currently not represented by a view on screen
* but only in the direction given.
*
* @param selectedPos Current selected position to move from
* @param direction Direction to move in
* @return Desired selected position after moving in the given direction
*/
private final int nextSelectedPositionForDirection(int selectedPos, int direction) {
int nextSelected;
if (direction == View.FOCUS_DOWN) {
nextSelected = selectedPos != INVALID_POSITION && selectedPos >= mFirstPosition ?
selectedPos + 1 :
mFirstPosition;
} else {
final int lastPos = mFirstPosition + getChildCount() - 1;
nextSelected = selectedPos != INVALID_POSITION && selectedPos < lastPos?
selectedPos - 1 :
lastPos;
}
if (nextSelected < 0 || nextSelected >= mAdapter.getCount()) {
return INVALID_POSITION;
}
return lookForSelectablePosition(nextSelected, direction == View.FOCUS_DOWN);
}
/**
* Handle an arrow scroll going up or down. Take into account whether items are selectable,
* whether there are focusable items etc.
@@ -2431,9 +2459,7 @@ public class ListView extends AbsListView {
View selectedView = getSelectedView();
int selectedPos = mSelectedPosition;
int nextSelectedPosition = (direction == View.FOCUS_DOWN) ?
lookForSelectablePosition(selectedPos + 1, true) :
lookForSelectablePosition(selectedPos - 1, false);
int nextSelectedPosition = nextSelectedPositionForDirection(selectedPos, direction);
int amountToScroll = amountToScroll(direction, nextSelectedPosition);
// if we are moving focus, we may OVERRIDE the default behavior