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

am 9f85ef4a: Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread

Browse Source 
Merge commit '9f85ef4aebf510546355866b7cc458551ae3aa7f' into gingerbread-plus-aosp

* commit '9f85ef4aebf510546355866b7cc458551ae3aa7f':
  DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
This commit is contained in:
Adam Powell
2010-10-18 14:23:14 -07:00
committed by Android Git Automerger
parent 11eada780d 9f85ef4aeb
commit 6018745fb7
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webkit/WebView.java
View File

@@ -5637,6 +5637,11 @@ public class WebView extends AbsoluteLayout
overScrollBy(deltaX, deltaY, oldX, oldY, overScrollBy(deltaX, deltaY, oldX, oldY,
rangeX, rangeY, rangeX, rangeY,
mOverscrollDistance, mOverscrollDistance, true); mOverscrollDistance, mOverscrollDistance, true);
if (mEdgeGlowTop != null &&
(!mEdgeGlowTop.isFinished() || !mEdgeGlowBottom.isFinished() ||
!mEdgeGlowLeft.isFinished() || !mEdgeGlowRight.isFinished())) {
invalidate();
}
} }
if (!getSettings().getBuiltInZoomControls()) { if (!getSettings().getBuiltInZoomControls()) {
boolean showPlusMinus = mMinZoomScale < mMaxZoomScale; boolean showPlusMinus = mMinZoomScale < mMaxZoomScale;