summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-10-18 14:19:52 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-18 14:19:52 -0700
commit9f85ef4aebf510546355866b7cc458551ae3aa7f (patch)
treed580416152f41bc9758874fcce0b9dd6d2d7f7db /core
parentba2ec2b44f33f55ff8507199e4e8b108a4bec7b1 (diff)
parent48b99ace195035286df604636f04860b2a0ee1f4 (diff)
downloadframeworks_base-9f85ef4aebf510546355866b7cc458551ae3aa7f.zip
frameworks_base-9f85ef4aebf510546355866b7cc458551ae3aa7f.tar.gz
frameworks_base-9f85ef4aebf510546355866b7cc458551ae3aa7f.tar.bz2
Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread
Diffstat (limited to 'core')
-rw-r--r--core/java/android/webkit/WebView.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 040bf15..9098639 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5619,6 +5619,11 @@ public class WebView extends AbsoluteLayout
overScrollBy(deltaX, deltaY, oldX, oldY,
rangeX, rangeY,
mOverscrollDistance, mOverscrollDistance, true);
+ if (mEdgeGlowTop != null &&
+ (!mEdgeGlowTop.isFinished() || !mEdgeGlowBottom.isFinished() ||
+ !mEdgeGlowLeft.isFinished() || !mEdgeGlowRight.isFinished())) {
+ invalidate();
+ }
}
if (!getSettings().getBuiltInZoomControls()) {
boolean showPlusMinus = mMinZoomScale < mMaxZoomScale;