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

am 9d33d953: Merge change I07729abd into eclair

Browse Source 
Merge commit '9d33d953a04eb9288c8b842610baf24c164346aa' into eclair-plus-aosp

* commit '9d33d953a04eb9288c8b842610baf24c164346aa':
  Keep the scrollbar on during TOUCH_MOVE events even
This commit is contained in:
Grace Kloba
2009-09-30 21:48:02 -07:00
committed by Android Git Automerger
parent d5aa602861 9d33d953a0
commit ff9af3f3ee
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3871,11 +3871,25 @@ public class WebView extends AbsoluteLayout
if (mSnapScrollMode == SNAP_X
|| mSnapScrollMode == SNAP_X_LOCK) {
scrollBy(deltaX, 0);
if (deltaX == 0) {
// keep the scrollbar on the screen even there is no
// scroll
awakenScrollBars(ViewConfiguration
.getScrollDefaultDelay(), false);
} else {
scrollBy(deltaX, 0);
}
mLastTouchX = x;
} else if (mSnapScrollMode == SNAP_Y
|| mSnapScrollMode == SNAP_Y_LOCK) {
scrollBy(0, deltaY);
if (deltaY == 0) {
// keep the scrollbar on the screen even there is no
// scroll
awakenScrollBars(ViewConfiguration
.getScrollDefaultDelay(), false);
} else {
scrollBy(0, deltaY);
}
mLastTouchY = y;
} else {
scrollBy(deltaX, deltaY);
@@ -3900,6 +3914,9 @@ public class WebView extends AbsoluteLayout
}
if (done) {
// keep the scrollbar on the screen even there is no scroll
awakenScrollBars(ViewConfiguration.getScrollDefaultDelay(),
false);
// return false to indicate that we can't pan out of the
// view space
return false;