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

Merge "Fix bug #5282141 ScrollView overscroll should not generate invalidations when not needed (ANR textview redraws constantly when touched)"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2011-09-13 15:35:06 -07:00
committed by Android (Google) Code Review
parent 8518d37b74 e9dbef85d3
commit d309a0434a
2 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,14 +16,10 @@
package android.widget; package android.widget;
import com.android.internal.R;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.FocusFinder; import android.view.FocusFinder;
import android.view.InputDevice; import android.view.InputDevice;
@@ -569,16 +565,18 @@ public class HorizontalScrollView extends FrameLayout {
final int oldX = mScrollX; final int oldX = mScrollX;
final int oldY = mScrollY; final int oldY = mScrollY;
final int range = getScrollRange(); final int range = getScrollRange();
if (overScrollBy(deltaX, 0, mScrollX, 0, range, 0, final int overscrollMode = getOverScrollMode();
final boolean canOverscroll = overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0);
if (canOverscroll && overScrollBy(deltaX, 0, mScrollX, 0, range, 0,
mOverscrollDistance, 0, true)) { mOverscrollDistance, 0, true)) {
// Break our velocity if we hit a scroll barrier. // Break our velocity if we hit a scroll barrier.
mVelocityTracker.clear(); mVelocityTracker.clear();
} }
onScrollChanged(mScrollX, mScrollY, oldX, oldY); onScrollChanged(mScrollX, mScrollY, oldX, oldY);
final int overscrollMode = getOverScrollMode(); if (canOverscroll) {
if (overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) {
final int pulledToX = oldX + deltaX; final int pulledToX = oldX + deltaX;
if (pulledToX < 0) { if (pulledToX < 0) {
mEdgeGlowLeft.onPull((float) deltaX / getWidth()); mEdgeGlowLeft.onPull((float) deltaX / getWidth());
@@ -604,11 +602,15 @@ public class HorizontalScrollView extends FrameLayout {
velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity); velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
int initialVelocity = (int) velocityTracker.getXVelocity(mActivePointerId); int initialVelocity = (int) velocityTracker.getXVelocity(mActivePointerId);
if (getChildCount() > 0) { final int right = getScrollRange();
final int overscrollMode = getOverScrollMode();
final boolean canOverscroll = overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && right > 0);
if (getChildCount() > 0 && canOverscroll) {
if ((Math.abs(initialVelocity) > mMinimumVelocity)) { if ((Math.abs(initialVelocity) > mMinimumVelocity)) {
fling(-initialVelocity); fling(-initialVelocity);
} else { } else {
final int right = getScrollRange();
if (mScroller.springBack(mScrollX, mScrollY, 0, right, 0, 0)) { if (mScroller.springBack(mScrollX, mScrollY, 0, right, 0, 0)) {
invalidate(); invalidate();
} }
@@ -1187,14 +1189,16 @@ public class HorizontalScrollView extends FrameLayout {
int y = mScroller.getCurrY(); int y = mScroller.getCurrY();
if (oldX != x || oldY != y) { if (oldX != x || oldY != y) {
overScrollBy(x - oldX, y - oldY, oldX, oldY, getScrollRange(), 0, final int range = getScrollRange();
final int overscrollMode = getOverScrollMode();
final boolean canOverscroll = overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0);
overScrollBy(x - oldX, y - oldY, oldX, oldY, range, 0,
mOverflingDistance, 0, false); mOverflingDistance, 0, false);
onScrollChanged(mScrollX, mScrollY, oldX, oldY); onScrollChanged(mScrollX, mScrollY, oldX, oldY);
final int range = getScrollRange(); if (canOverscroll) {
final int overscrollMode = getOverScrollMode();
if (overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) {
if (x < 0 && oldX >= 0) { if (x < 0 && oldX >= 0) {
mEdgeGlowLeft.onAbsorb((int) mScroller.getCurrVelocity()); mEdgeGlowLeft.onAbsorb((int) mScroller.getCurrVelocity());
} else if (x > range && oldX <= range) { } else if (x > range && oldX <= range) {
@@ -1202,6 +1206,7 @@ public class HorizontalScrollView extends FrameLayout {
} }
} }
} }
awakenScrollBars(); awakenScrollBars();
// Keep on drawing until the animation has finished. // Keep on drawing until the animation has finished.

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

@@ -19,11 +19,9 @@ package android.widget;
import com.android.internal.R; import com.android.internal.R;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.StrictMode; import android.os.StrictMode;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.FocusFinder; import android.view.FocusFinder;
@@ -581,16 +579,18 @@ public class ScrollView extends FrameLayout {
final int oldX = mScrollX; final int oldX = mScrollX;
final int oldY = mScrollY; final int oldY = mScrollY;
final int range = getScrollRange(); final int range = getScrollRange();
if (overScrollBy(0, deltaY, 0, mScrollY, 0, range, final int overscrollMode = getOverScrollMode();
0, mOverscrollDistance, true)) { final boolean canOverscroll = overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0);
if (canOverscroll && overScrollBy(0, deltaY, 0, mScrollY,
0, range, 0, mOverscrollDistance, true)) {
// Break our velocity if we hit a scroll barrier. // Break our velocity if we hit a scroll barrier.
mVelocityTracker.clear(); mVelocityTracker.clear();
} }
onScrollChanged(mScrollX, mScrollY, oldX, oldY); onScrollChanged(mScrollX, mScrollY, oldX, oldY);
final int overscrollMode = getOverScrollMode(); if (canOverscroll) {
if (overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) {
final int pulledToY = oldY + deltaY; final int pulledToY = oldY + deltaY;
if (pulledToY < 0) { if (pulledToY < 0) {
mEdgeGlowTop.onPull((float) deltaY / getHeight()); mEdgeGlowTop.onPull((float) deltaY / getHeight());
@@ -616,11 +616,15 @@ public class ScrollView extends FrameLayout {
velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity); velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
int initialVelocity = (int) velocityTracker.getYVelocity(mActivePointerId); int initialVelocity = (int) velocityTracker.getYVelocity(mActivePointerId);
if (getChildCount() > 0) { final int bottom = getScrollRange();
final int overscrollMode = getOverScrollMode();
final boolean canOverscroll = overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && bottom > 0);
if (getChildCount() > 0 && canOverscroll) {
if ((Math.abs(initialVelocity) > mMinimumVelocity)) { if ((Math.abs(initialVelocity) > mMinimumVelocity)) {
fling(-initialVelocity); fling(-initialVelocity);
} else { } else {
final int bottom = getScrollRange();
if (mScroller.springBack(mScrollX, mScrollY, 0, 0, 0, bottom)) { if (mScroller.springBack(mScrollX, mScrollY, 0, 0, 0, bottom)) {
invalidate(); invalidate();
} }
@@ -1193,14 +1197,16 @@ public class ScrollView extends FrameLayout {
int y = mScroller.getCurrY(); int y = mScroller.getCurrY();
if (oldX != x || oldY != y) { if (oldX != x || oldY != y) {
overScrollBy(x - oldX, y - oldY, oldX, oldY, 0, getScrollRange(), final int range = getScrollRange();
final int overscrollMode = getOverScrollMode();
final boolean canOverscroll = overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0);
overScrollBy(x - oldX, y - oldY, oldX, oldY, 0, range,
0, mOverflingDistance, false); 0, mOverflingDistance, false);
onScrollChanged(mScrollX, mScrollY, oldX, oldY); onScrollChanged(mScrollX, mScrollY, oldX, oldY);
final int range = getScrollRange(); if (canOverscroll) {
final int overscrollMode = getOverScrollMode();
if (overscrollMode == OVER_SCROLL_ALWAYS ||
(overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) {
if (y < 0 && oldY >= 0) { if (y < 0 && oldY >= 0) {
mEdgeGlowTop.onAbsorb((int) mScroller.getCurrVelocity()); mEdgeGlowTop.onAbsorb((int) mScroller.getCurrVelocity());
} else if (y > range && oldY <= range) { } else if (y > range && oldY <= range) {
@@ -1208,6 +1214,7 @@ public class ScrollView extends FrameLayout {
} }
} }
} }
awakenScrollBars(); awakenScrollBars();
// Keep on drawing until the animation has finished. // Keep on drawing until the animation has finished.