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

am badd8399: fix copy/paste using trackball on passion

Browse Source 
Merge commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250' into eclair-mr2-plus-aosp

* commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250':
  fix copy/paste using trackball on passion
This commit is contained in:
Cary Clark
2009-10-15 11:02:27 -07:00
committed by Android Git Automerger
parent 033696e059 badd8399ca
commit fc52737ecc
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2967,12 +2967,12 @@ public class WebView extends AbsoluteLayout
animateScroll); animateScroll);
if (mNativeClass == 0) return; if (mNativeClass == 0) return;
if (mShiftIsPressed) { if (mShiftIsPressed && !animateZoom) {
if (mTouchSelection) { if (mTouchSelection) {
nativeDrawSelectionRegion(canvas); nativeDrawSelectionRegion(canvas);
} else { } else {
nativeDrawSelection(canvas, mSelectX, mSelectY, nativeDrawSelection(canvas, mInvActualScale, getTitleHeight(),
mExtendSelection); mSelectX, mSelectY, mExtendSelection);
} }
} else if (drawCursorRing) { } else if (drawCursorRing) {
if (mTouchMode == TOUCH_SHORTPRESS_START_MODE) { if (mTouchMode == TOUCH_SHORTPRESS_START_MODE) {
@ -4137,6 +4137,9 @@ public class WebView extends AbsoluteLayout
return true; return true;
} }
if (ev.getAction() == MotionEvent.ACTION_DOWN) { if (ev.getAction() == MotionEvent.ACTION_DOWN) {
if (mShiftIsPressed) {
return true; // discard press if copy in progress
}
mTrackballDown = true; mTrackballDown = true;
if (mNativeClass == 0) { if (mNativeClass == 0) {
return false; return false;
@ -4165,6 +4168,7 @@ public class WebView extends AbsoluteLayout
} else { } else {
mExtendSelection = true; mExtendSelection = true;
} }
return true; // discard press if copy in progress
} }
if (DebugFlags.WEB_VIEW) { if (DebugFlags.WEB_VIEW) {
Log.v(LOGTAG, "onTrackballEvent up ev=" + ev Log.v(LOGTAG, "onTrackballEvent up ev=" + ev
@ -5710,8 +5714,8 @@ public class WebView extends AbsoluteLayout
private native void nativeDestroy(); private native void nativeDestroy();
private native void nativeDrawCursorRing(Canvas content); private native void nativeDrawCursorRing(Canvas content);
private native void nativeDrawMatches(Canvas canvas); private native void nativeDrawMatches(Canvas canvas);
private native void nativeDrawSelection(Canvas content private native void nativeDrawSelection(Canvas content, float scale,
, int x, int y, boolean extendSelection); int offset, int x, int y, boolean extendSelection);
private native void nativeDrawSelectionRegion(Canvas content); private native void nativeDrawSelectionRegion(Canvas content);
private native void nativeDumpDisplayTree(String urlOrNull); private native void nativeDumpDisplayTree(String urlOrNull);
private native int nativeFindAll(String findLower, String findUpper); private native int nativeFindAll(String findLower, String findUpper);