Merge "Fix some mouse + list-item selection/scrolling issues" (fa361abd) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsListView.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -3866,6 +3866,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		private void onTouchDown(MotionEvent ev) {
		mHasPerformedLongPress = false;
		mActivePointerId = ev.getPointerId(0);
		hideSelector();

		if (mTouchMode == TOUCH_MODE_OVERFLING) {
		// Stopped the fling. It is a scroll.
		@@ -5226,17 +5227,21 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		}

		mRecycler.fullyDetachScrapViews();
		boolean selectorOnScreen = false;
		if (!inTouchMode && mSelectedPosition != INVALID_POSITION) {
		final int childIndex = mSelectedPosition - mFirstPosition;
		if (childIndex >= 0 && childIndex < getChildCount()) {
		positionSelector(mSelectedPosition, getChildAt(childIndex));
		selectorOnScreen = true;
		}
		} else if (mSelectorPosition != INVALID_POSITION) {
		final int childIndex = mSelectorPosition - mFirstPosition;
		if (childIndex >= 0 && childIndex < getChildCount()) {
		positionSelector(INVALID_POSITION, getChildAt(childIndex));
		positionSelector(mSelectorPosition, getChildAt(childIndex));
		selectorOnScreen = true;
		}
		} else {
		}
		if (!selectorOnScreen) {
		mSelectorRect.setEmpty();
		}