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

am c9e2e661: slide the title if the site changes the scroll position

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

* commit 'c9e2e661f0cbc736b948f8aca4c65d0467c44c79':
  slide the title if the site changes the scroll position
This commit is contained in:
Cary Clark
2009-09-16 12:30:21 -07:00
committed by Android Git Automerger
parent 0c22890531 c9e2e661f0
commit 20158b9ce5
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,6 +420,7 @@ public class WebView extends AbsoluteLayout
private static final int STD_SPEED = 480; // pixels per second
// time for the longest scroll animation
private static final int MAX_DURATION = 750; // milliseconds
private static final int SLIDE_TITLE_DURATION = 300; // milliseconds
private Scroller mScroller;
private boolean mWrapContent;
@@ -2416,10 +2417,18 @@ public class WebView extends AbsoluteLayout
if ((dx | dy) == 0) {
return false;
}
if (true && animate) {
// mobile sites prefer to scroll to (0, 1), thus the + 1 below
boolean slideTitle = getVisibleTitleHeight() > 0
&& y <= getTitleHeight() + 1;
if (DebugFlags.WEB_VIEW) {
Log.v(LOGTAG, "pinScrollTo slideTitle=" + slideTitle
+ " getVisibleTitleHeight()=" + getVisibleTitleHeight()
+ " animationDuration=" + animationDuration + " y=" + y);
}
if (slideTitle || animate) {
// Log.d(LOGTAG, "startScroll: " + dx + " " + dy);
if (slideTitle && animationDuration < SLIDE_TITLE_DURATION)
animationDuration = SLIDE_TITLE_DURATION;
mScroller.startScroll(mScrollX, mScrollY, dx, dy,
animationDuration > 0 ? animationDuration : computeDuration(dx, dy));
invalidate();