Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom (41d6bfb2) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -4441,6 +4441,7 @@ public class WebView extends AbsoluteLayout
		mHeldMotionless = MOTIONLESS_PENDING;
		}
		}
		int saveCount = canvas.save();
		if (animateZoom) {
		mZoomManager.animateZoom(canvas);
		} else if (!canvas.isHardwareAccelerated()) {
		@@ -4491,10 +4492,6 @@ public class WebView extends AbsoluteLayout
		nativeUseHardwareAccelSkia(mHardwareAccelSkia);
		}

		if (mSelectingText && USE_JAVA_TEXT_SELECTION) {
		drawTextSelectionHandles(canvas);
		}

		} else {
		DrawFilter df = null;
		if (mZoomManager.isZoomAnimating() \|\| UIAnimationsRunning) {
		@@ -4512,6 +4509,11 @@ public class WebView extends AbsoluteLayout
		}
		}

		canvas.restoreToCount(saveCount);
		if (mSelectingText && USE_JAVA_TEXT_SELECTION) {
		drawTextSelectionHandles(canvas);
		}

		if (extras == DRAW_EXTRAS_CURSOR_RING) {
		if (mTouchMode == TOUCH_SHORTPRESS_START_MODE) {
		mTouchMode = TOUCH_SHORTPRESS_MODE;