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

am 210462e5: am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo

Browse Source 
Merge commit '210462e57762be9bb016b4d05374cae5f48b5aea' into kraken

* commit '210462e57762be9bb016b4d05374cae5f48b5aea':
  Set mHeldMotionless to a new MOTIONLESS_IGNORE state
This commit is contained in:
Grace Kloba
2010-04-10 11:47:15 -07:00
committed by Android Git Automerger
parent cf2bd28510 210462e577
commit 449491ced0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -475,6 +475,7 @@ public class WebView extends AbsoluteLayout
private static final int MOTIONLESS_FALSE = 0; private static final int MOTIONLESS_FALSE = 0;
private static final int MOTIONLESS_PENDING = 1; private static final int MOTIONLESS_PENDING = 1;
private static final int MOTIONLESS_TRUE = 2; private static final int MOTIONLESS_TRUE = 2;
private static final int MOTIONLESS_IGNORE = 3;
private int mHeldMotionless; private int mHeldMotionless;
// whether support multi-touch // whether support multi-touch
@@ -4923,9 +4924,6 @@ public class WebView extends AbsoluteLayout
case TOUCH_DRAG_MODE: case TOUCH_DRAG_MODE:
mPrivateHandler.removeMessages(DRAG_HELD_MOTIONLESS); mPrivateHandler.removeMessages(DRAG_HELD_MOTIONLESS);
mPrivateHandler.removeMessages(AWAKEN_SCROLL_BARS); mPrivateHandler.removeMessages(AWAKEN_SCROLL_BARS);
mHeldMotionless = MOTIONLESS_TRUE;
// redraw in high-quality, as we're done dragging
invalidate();
// if the user waits a while w/o moving before the // if the user waits a while w/o moving before the
// up, we don't want to do a fling // up, we don't want to do a fling
if (eventTime - mLastTouchTime <= MIN_FLING_TIME) { if (eventTime - mLastTouchTime <= MIN_FLING_TIME) {
@@ -4937,9 +4935,16 @@ public class WebView extends AbsoluteLayout
+ mDeferTouchProcess); + mDeferTouchProcess);
} }
mVelocityTracker.addMovement(ev); mVelocityTracker.addMovement(ev);
// set to MOTIONLESS_IGNORE so that it won't keep
// removing and sending message in
// drawCoreAndCursorRing()
mHeldMotionless = MOTIONLESS_IGNORE;
doFling(); doFling();
break; break;
} }
// redraw in high-quality, as we're done dragging
mHeldMotionless = MOTIONLESS_TRUE;
invalidate();
// fall through // fall through
case TOUCH_DRAG_START_MODE: case TOUCH_DRAG_START_MODE:
// TOUCH_DRAG_START_MODE should not happen for the real // TOUCH_DRAG_START_MODE should not happen for the real