Merge "Revert "Fix ListView is not scrolled properly with arrows"" into jb-mr2-dev (51e78360) · Commits · e / os / android_frameworks_base

core/java/android/widget/ListView.java

+3 −15

Original line number	Diff line number	Diff line
		@@ -2429,9 +2429,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 = lookForSelectablePositionOnScreen(direction);
		int amountToScroll = amountToScroll(direction, nextSelectedPosition);

		// if we are moving focus, we may OVERRIDE the default behavior
		@@ -2643,18 +2641,14 @@ public class ListView extends AbsListView {
		final int listBottom = getHeight() - mListPadding.bottom;
		final int listTop = mListPadding.top;

		int numChildren = getChildCount();
		final int numChildren = getChildCount();

		if (direction == View.FOCUS_DOWN) {
		int indexToMakeVisible = numChildren - 1;
		if (nextSelectedPosition != INVALID_POSITION) {
		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 View viewToMakeVisible = getChildAt(indexToMakeVisible);

		@@ -2688,12 +2682,6 @@ public class ListView extends AbsListView {
		if (nextSelectedPosition != INVALID_POSITION) {
		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 View viewToMakeVisible = getChildAt(indexToMakeVisible);
		int goalTop = listTop;