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

am 92534768: Merge change I33909a6a into eclair-mr2

Browse Source 
Merge commit '925347688d946d9782bc1cfaa95baacd5b630e38' into eclair-mr2-plus-aosp

* commit '925347688d946d9782bc1cfaa95baacd5b630e38':
  Do not scroll the title bar off screen until the page finishes loading.
This commit is contained in:
Leon Scroggins
2009-11-03 16:22:10 -08:00
committed by Android Git Automerger
parent eb7e27e800 925347688d
commit 91fc33004b
2 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,8 +251,10 @@ class CallbackProxy extends Handler {
break;
case PAGE_FINISHED:
String finishedUrl = (String) msg.obj;
mWebView.onPageFinished(finishedUrl);
if (mWebViewClient != null) {
mWebViewClient.onPageFinished(mWebView, (String) msg.obj);
mWebViewClient.onPageFinished(mWebView, finishedUrl);
}
break;
@@ -777,11 +779,6 @@ class CallbackProxy extends Handler {
}
public void onPageFinished(String url) {
// Do an unsynchronized quick check to avoid posting if no callback has
// been set.
if (mWebViewClient == null) {
return;
}
// Performance probe
if (PERF_PROBE) {
// un-comment this if PERF_PROBE is true

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

@@ -2548,6 +2548,41 @@ public class WebView extends AbsoluteLayout
}
}
/**
* Called by CallbackProxy when the page finishes loading.
* @param url The URL of the page which has finished loading.
*/
/* package */ void onPageFinished(String url) {
if (mPageThatNeedsToSlideTitleBarOffScreen != null) {
// If the user is now on a different page, or has scrolled the page
// past the point where the title bar is offscreen, ignore the
// scroll request.
if (mPageThatNeedsToSlideTitleBarOffScreen.equals(url)
&& mScrollX == 0 && mScrollY == 0) {
pinScrollTo(0, mYDistanceToSlideTitleOffScreen, true,
SLIDE_TITLE_DURATION);
}
mPageThatNeedsToSlideTitleBarOffScreen = null;
}
}
/**
* The URL of a page that sent a message to scroll the title bar off screen.
*
* Many mobile sites tell the page to scroll to (0,1) in order to scroll the
* title bar off the screen. Sometimes, the scroll position is set before
* the page finishes loading. Rather than scrolling while the page is still
* loading, keep track of the URL and new scroll position so we can perform
* the scroll once the page finishes loading.
*/
private String mPageThatNeedsToSlideTitleBarOffScreen;
/**
* The destination Y scroll position to be used when the page finishes
* loading. See mPageThatNeedsToSlideTitleBarOffScreen.
*/
private int mYDistanceToSlideTitleOffScreen;
// scale from content to view coordinates, and pin
// return true if pin caused the final x/y different than the request cx/cy,
// and a future scroll may reach the request cx/cy after our size has
@@ -2582,8 +2617,18 @@ public class WebView extends AbsoluteLayout
// page, assume this is an attempt to scroll off the title bar, and
// animate the title bar off screen slowly enough that the user can see
// it.
if (cx == 0 && cy == 1 && mScrollX == 0 && mScrollY == 0) {
pinScrollTo(vx, vy, true, SLIDE_TITLE_DURATION);
if (cx == 0 && cy == 1 && mScrollX == 0 && mScrollY == 0
&& mTitleBar != null) {
// FIXME: 100 should be defined somewhere as our max progress.
if (getProgress() < 100) {
// Wait to scroll the title bar off screen until the page has
// finished loading. Keep track of the URL and the destination
// Y position
mPageThatNeedsToSlideTitleBarOffScreen = getUrl();
mYDistanceToSlideTitleOffScreen = vy;
} else {
pinScrollTo(vx, vy, true, SLIDE_TITLE_DURATION);
}
// Since we are animating, we have not yet reached the desired
// scroll position. Do not return true to request another attempt
return false;