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

am d84e7d53: Allow scrolls to continue when getting a new content size.

Browse Source 
Merge commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea' into eclair-plus-aosp

* commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea':
  Allow scrolls to continue when getting a new content size.
This commit is contained in:
Leon Scroggins
2009-09-29 12:09:01 -07:00
committed by Android Git Automerger
parent 253f836277 d84e7d53d3
commit a4f2ac7e0e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1917,12 +1917,15 @@ public class WebView extends AbsoluteLayout
int oldY = mScrollY;
mScrollX = pinLocX(mScrollX);
mScrollY = pinLocY(mScrollY);
// android.util.Log.d("skia", "recordNewContentSize -
// abortAnimation");
abortAnimation(); // just in case
if (oldX != mScrollX || oldY != mScrollY) {
sendOurVisibleRect();
}
if (!mScroller.isFinished()) {
// We are in the middle of a scroll. Repin the final scroll
// position.
mScroller.setFinalX(pinLocX(mScroller.getFinalX()));
mScroller.setFinalY(pinLocY(mScroller.getFinalY()));
}
}
}
contentSizeChanged(updateLayout);