Merge change 23381 into eclair (0f44220b) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.util.AttributeSet;
		import android.util.Config;
		import android.util.DisplayMetrics;
		import android.util.EventLog;
		import android.util.Log;
		import android.util.Pool;

core/java/android/widget/AbsListView.java

+25 −10

Original line number	Diff line number	Diff line
		@@ -1996,7 +1996,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		if (y != mLastY) {
		deltaY -= mMotionCorrection;
		int incrementalDeltaY = mLastY != Integer.MIN_VALUE ? y - mLastY : deltaY;
		// No need to do all this work if we're not going to move anyway
		if (incrementalDeltaY != 0) {
		trackMotionScroll(deltaY, incrementalDeltaY);
		}

		// Check to see if we have bumped into the scroll limit
		View motionView = this.getChildAt(mMotionPosition - mFirstPosition);
		@@ -2087,15 +2090,27 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		mTouchMode = TOUCH_MODE_REST;
		break;
		case TOUCH_MODE_SCROLL:
		final int childCount = getChildCount();
		if (childCount > 0) {
		if (mFirstPosition == 0 && getChildAt(0).getTop() >= mListPadding.top &&
		mFirstPosition + childCount < mItemCount &&
		getChildAt(childCount - 1).getBottom() <=
		getHeight() - mListPadding.bottom) {
		mTouchMode = TOUCH_MODE_REST;
		reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
		} else {
		final VelocityTracker velocityTracker = mVelocityTracker;
		velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
		final int initialVelocity = (int) velocityTracker.getYVelocity();
		if (Math.abs(initialVelocity) > mMinimumVelocity && (getChildCount() > 0)) {

		if (Math.abs(initialVelocity) > mMinimumVelocity) {
		if (mFlingRunnable == null) {
		mFlingRunnable = new FlingRunnable();
		}
		reportScrollStateChange(OnScrollListener.SCROLL_STATE_FLING);
		mFlingRunnable.start(-initialVelocity);
		}
		}
		} else {
		mTouchMode = TOUCH_MODE_REST;
		reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);

core/java/android/widget/ListView.java

+17 −13

Original line number	Diff line number	Diff line
		@@ -1328,7 +1328,8 @@ public class ListView extends AbsListView {

		// Make sure we are 1) Too low, and 2) Either there are more rows below the
		// last row or the last row is scrolled off the bottom of the drawable area
		if (topOffset > 0 && (lastPosition < mItemCount - 1 \|\| lastBottom > end)) {
		if (topOffset > 0) {
		if (lastPosition < mItemCount - 1 \|\| lastBottom > end) {
		if (lastPosition == mItemCount - 1) {
		// Don't pull the bottom too far up
		topOffset = Math.min(topOffset, lastBottom - end);
		@@ -1342,6 +1343,9 @@ public class ListView extends AbsListView {
		// Close up the remaining gap
		adjustViewsUpOrDown();
		}
		} else if (lastPosition == mItemCount - 1) {
		adjustViewsUpOrDown();
		}
		}
		}
		}