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

Merge "Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView."

Browse Source
This commit is contained in:
Adam Powell
2010-01-28 21:24:10 -08:00
committed by Android (Google) Code Review
parent 05d72117f9 f54460576e
commit a9938c4bf4
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/HorizontalScrollView.java
View File

@@ -821,10 +821,13 @@ public class HorizontalScrollView extends FrameLayout {
}
long duration = AnimationUtils.currentAnimationTimeMillis() - mLastScroll;
if (duration > ANIMATED_SCROLL_GAP) {
int width = getWidth() - mPaddingRight - mPaddingLeft;
int right = getChildAt(0).getWidth();
mScroller.startScroll(mScrollX, mScrollY, dx, dy,
0, Math.max(0, right - width), 0, 0);
final int width = getWidth() - mPaddingRight - mPaddingLeft;
final int right = getChildAt(0).getWidth();
final int maxX = Math.max(0, right - width);
final int scrollX = mScrollX;
dx = Math.max(0, Math.min(scrollX + dx, maxX)) - scrollX;
mScroller.startScroll(scrollX, mScrollY, dx, 0);
awakenScrollBars(mScroller.getDuration());
invalidate();
} else {

11
core/java/android/widget/ScrollView.java
View File

@@ -823,10 +823,13 @@ public class ScrollView extends FrameLayout {
}
long duration = AnimationUtils.currentAnimationTimeMillis() - mLastScroll;
if (duration > ANIMATED_SCROLL_GAP) {
int height = getHeight() - mPaddingBottom - mPaddingTop;
int bottom = getChildAt(0).getHeight();
mScroller.startScroll(mScrollX, mScrollY, dx, dy,
0, 0, 0, Math.max(0, bottom - height));
final int height = getHeight() - mPaddingBottom - mPaddingTop;
final int bottom = getChildAt(0).getHeight();
final int maxY = Math.max(0, bottom - height);
final int scrollY = mScrollY;
dy = Math.max(0, Math.min(scrollY + dy, maxY)) - scrollY;
mScroller.startScroll(mScrollX, scrollY, 0, dy);
awakenScrollBars(mScroller.getDuration());
invalidate();
} else {