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

Merge "Fix ListView is not scrolled properly with arrows"

Browse Source
This commit is contained in:
Adam Powell
2013-02-22 21:29:44 +00:00
committed by Gerrit Code Review
parent 08a92a335f db68fac12d
commit d61ff77ee1
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2429,7 +2429,9 @@ public class ListView extends AbsListView {
View selectedView = getSelectedView(); View selectedView = getSelectedView();
int selectedPos = mSelectedPosition; int selectedPos = mSelectedPosition;
int nextSelectedPosition = lookForSelectablePositionOnScreen(direction); int nextSelectedPosition = (direction == View.FOCUS_DOWN) ?
lookForSelectablePosition(selectedPos + 1, true) :
lookForSelectablePosition(selectedPos - 1, false);
int amountToScroll = amountToScroll(direction, nextSelectedPosition); int amountToScroll = amountToScroll(direction, nextSelectedPosition);
// if we are moving focus, we may OVERRIDE the default behavior // if we are moving focus, we may OVERRIDE the default behavior
@@ -2641,14 +2643,18 @@ public class ListView extends AbsListView {
final int listBottom = getHeight() - mListPadding.bottom; final int listBottom = getHeight() - mListPadding.bottom;
final int listTop = mListPadding.top; final int listTop = mListPadding.top;
final int numChildren = getChildCount(); int numChildren = getChildCount();
if (direction == View.FOCUS_DOWN) { if (direction == View.FOCUS_DOWN) {
int indexToMakeVisible = numChildren - 1; int indexToMakeVisible = numChildren - 1;
if (nextSelectedPosition != INVALID_POSITION) { if (nextSelectedPosition != INVALID_POSITION) {
indexToMakeVisible = nextSelectedPosition - mFirstPosition; indexToMakeVisible = nextSelectedPosition - mFirstPosition;
} }
while (numChildren <= indexToMakeVisible) {
// Child to view is not attached yet.
addViewBelow(getChildAt(numChildren - 1), mFirstPosition + numChildren - 1);
numChildren++;
}
final int positionToMakeVisible = mFirstPosition + indexToMakeVisible; final int positionToMakeVisible = mFirstPosition + indexToMakeVisible;
final View viewToMakeVisible = getChildAt(indexToMakeVisible); final View viewToMakeVisible = getChildAt(indexToMakeVisible);
@@ -2682,6 +2688,12 @@ public class ListView extends AbsListView {
if (nextSelectedPosition != INVALID_POSITION) { if (nextSelectedPosition != INVALID_POSITION) {
indexToMakeVisible = nextSelectedPosition - mFirstPosition; indexToMakeVisible = nextSelectedPosition - mFirstPosition;
} }
while (indexToMakeVisible < 0) {
// Child to view is not attached yet.
addViewAbove(getChildAt(0), mFirstPosition);
mFirstPosition--;
indexToMakeVisible = nextSelectedPosition - mFirstPosition;
}
final int positionToMakeVisible = mFirstPosition + indexToMakeVisible; final int positionToMakeVisible = mFirstPosition + indexToMakeVisible;
final View viewToMakeVisible = getChildAt(indexToMakeVisible); final View viewToMakeVisible = getChildAt(indexToMakeVisible);
int goalTop = listTop; int goalTop = listTop;