am df4cf297: redraw once more on a touch-up if we\'ve been dragging, so we can redraw in high-quality mode update dox on BlurMaskFilter

Merge commit 'df4cf29715146d67306595108c565d9848a6ae1a' into eclair-plus-aosp

* commit 'df4cf29715146d67306595108c565d9848a6ae1a':
  redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
This commit is contained in:
Mike Reed
2009-09-15 13:46:59 -07:00
committed by Android Git Automerger
2 changed files with 13 additions and 4 deletions

View File

@@ -2754,6 +2754,7 @@ public class WebView extends AbsoluteLayout
zoomScale = mZoomScale; zoomScale = mZoomScale;
// set mZoomScale to be 0 as we have done animation // set mZoomScale to be 0 as we have done animation
mZoomScale = 0; mZoomScale = 0;
animateZoom = false; // inform drawContentPicture we're done
if (mNeedToAdjustWebTextView) { if (mNeedToAdjustWebTextView) {
mNeedToAdjustWebTextView = false; mNeedToAdjustWebTextView = false;
mWebTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, mWebTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
@@ -3801,6 +3802,8 @@ public class WebView extends AbsoluteLayout
mTouchSelection = false; mTouchSelection = false;
break; break;
case TOUCH_DRAG_MODE: case TOUCH_DRAG_MODE:
// 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) {

View File

@@ -16,13 +16,19 @@
package android.graphics; package android.graphics;
/**
* This takes a mask, and blurs its edge by the specified radius. Whether or
* or not to include the original mask, and whether the blur goes outside,
* inside, or straddles, the original mask's border, is controlled by the
* Blur enum.
*/
public class BlurMaskFilter extends MaskFilter { public class BlurMaskFilter extends MaskFilter {
public enum Blur { public enum Blur {
NORMAL(0), //!< fuzzy inside and outside NORMAL(0), //!< blur inside and outside of the original border
SOLID(1), //!< solid inside, fuzzy outside SOLID(1), //!< include the original mask, blur outside
OUTER(2), //!< nothing inside, fuzzy outside OUTER(2), //!< just blur outside the original border
INNER(3); //!< fuzzy inside, nothing outside INNER(3); //!< just blur inside the original border
Blur(int value) { Blur(int value) {
native_int = value; native_int = value;