drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix text selection drawing on SW"

Browse Source
This commit is contained in:
John Reck
2011-09-16 10:39:16 -07:00
committed by Android (Google) Code Review
parent 5908eaef12 57efcffc7f
commit 5dd1916c24
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4441,6 +4441,7 @@ public class WebView extends AbsoluteLayout
mHeldMotionless = MOTIONLESS_PENDING; mHeldMotionless = MOTIONLESS_PENDING;
} }
} }
int saveCount = canvas.save();
if (animateZoom) { if (animateZoom) {
mZoomManager.animateZoom(canvas); mZoomManager.animateZoom(canvas);
} else if (!canvas.isHardwareAccelerated()) { } else if (!canvas.isHardwareAccelerated()) {
@ -4491,10 +4492,6 @@ public class WebView extends AbsoluteLayout
nativeUseHardwareAccelSkia(mHardwareAccelSkia); nativeUseHardwareAccelSkia(mHardwareAccelSkia);
} }
if (mSelectingText && USE_JAVA_TEXT_SELECTION) {
drawTextSelectionHandles(canvas);
}
} else { } else {
DrawFilter df = null; DrawFilter df = null;
if (mZoomManager.isZoomAnimating() || UIAnimationsRunning) { 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 (extras == DRAW_EXTRAS_CURSOR_RING) {
if (mTouchMode == TOUCH_SHORTPRESS_START_MODE) { if (mTouchMode == TOUCH_SHORTPRESS_START_MODE) {
mTouchMode = TOUCH_SHORTPRESS_MODE; mTouchMode = TOUCH_SHORTPRESS_MODE;